X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/odin-cgi/blobdiff_plain/503f7910db83c22537705f378c0317e18b80170b..3300e9a2ef069dcea086ac6e510dd6540cd9fc82:/lib/Odin.pm

diff --git a/lib/Odin.pm b/lib/Odin.pm
index a9bff5a..551c51f 100644
--- a/lib/Odin.pm
+++ b/lib/Odin.pm
@@ -99,12 +99,10 @@ sub open_db (@) {
   my $drv = $db->{Driver}{Name};
   if ($drv eq "Pg") {
     $db->{private_odin_retry_p} = sub { $db->state =~ /^40[0P]01$/ };
-    $db->{private_odin_unixstamp} = sub { "extract(epoch from $_[0])" };
   } elsif ($drv eq "SQLite") {
     $db->{private_odin_retry_p} = sub { $db->err == 5 };
-    $db->{private_odin_unixstamp} = sub { "strftime('%s', $_[0])" };
   } else {
-    fail "unsupported database driver `$drv' (patches welcome)", undef;
+    $db->{private_odin_retry_p} = sub { 0 };
   }
 
   return $db;
@@ -131,10 +129,6 @@ sub xact (&$) {
   die $exc;
 }
 
-sub sql_timestamp ($$) {
-  my ($db, $col) = @_;
-  return $db->{private_odin_unixstamp}->($col);
-}
 
 ###--------------------------------------------------------------------------
 ### Sequence numbers and tagging.
@@ -267,8 +261,9 @@ sub new_shorturl ($) {
        undef, $WHOCMP, $url);
     unless (defined $tag) {
       $tag = encode_tag(next_seq($db, "odin_shorturl_seq"));
-      $db->do("INSERT INTO odin_shorturl (tag, owner, url) VALUES (?, ?, ?)",
-	      undef, $tag, $WHO, $url);
+      $db->do("INSERT INTO odin_shorturl (tag, stamp, owner, url)
+	       VALUES (?, ?, ?, ?)", undef,
+	      $tag, $NOW, $WHO, $url);
     }
   } $db;
   return $tag;
@@ -331,9 +326,9 @@ sub new_pastebin (\%) {
   xact {
     $tag = encode_tag next_seq $db, "odin_pastebin_seq";
     $db->do("INSERT INTO odin_pastebin
-	       (tag, edithash, owner, $PASTEBIN_PROPCOLS)
-	     VALUES (?, ?, ?, $PASTEBIN_PROPPLACES)", undef,
-	    $tag, $hash, $WHO, @{$new}{@PASTEBIN_PROPS});
+	       (tag, stamp, edithash, owner, $PASTEBIN_PROPCOLS)
+	     VALUES (?, ?, ?, ?, $PASTEBIN_PROPPLACES)", undef,
+	    $tag, $NOW, $hash, $WHO, @{$new}{@PASTEBIN_PROPS});
   } $db;
   return $tag, $editkey;
 }