Ticket #268: maia-postgres-1.0.0.patch

scripts/send-quarantine-digests.pl

@@ -121 +121 @@
 # anything below this point.                                           #
 ########################################################################
 
+# The organization of this file makes this a bit obtuse
+my $isPg = 0;
+
     # Retrieve the string value associated with a key in the database.cfg file.
     sub get_string_key($$)
     {
@@ -182 +185 @@
       my $unique_string = phrase_generate();
 
       my $insert = "INSERT INTO maia_tokens (token_system, token, data, expires) " .
-                   "VALUES ('digest',?,?, DATE_ADD(NOW(), INTERVAL ? DAY))";
+                   "VALUES ('digest',?,?, " .
+                       ($isPg ? "NOW() + INTERVAL ? DAY"
+                              : "DATE_ADD(NOW(), INTERVAL ? DAY)") .
+                           ")";
       my $sth = $dbh->prepare($insert);
       $sth->execute($unique_string, $maia_user_id,$days) or die (sprintf("Maia: [send-quarantine-reminders] Couldn't execute query: %s", $dbh->errstr));;
 
@@ -201 +207 @@
 
     # Connect to the database
     my $dsn = get_string_key($db_cfg, "dsn");
+    # The organization of this file makes this a bit obtuse
+    $isPg = $dsn =~ /^dbi:Pg/;
     my $username = get_string_key($db_cfg, "username");
     my $password = get_string_key($db_cfg, "password");
     my $dbh = DBI->connect($dsn, $username, $password)
@@ -240 +248 @@
               "WHERE maia_users.primary_email_id = users.id " .
               "AND maia_users.quarantine_digest_interval > 0 " .
               "AND (maia_users.quarantine_digest_interval <= " .
-                   "((UNIX_TIMESTAMP() - UNIX_TIMESTAMP(maia_users.last_digest_sent)) / 60) " .
+              ($isPg ? "(( ROUND(DATE_PART('epoch', NOW())) - ROUND(DATE_PART('epoch', maia_users.last_digest_sent))) / 60)"
+                     : "((UNIX_TIMESTAMP() - UNIX_TIMESTAMP(maia_users.last_digest_sent)) / 60) ") .
                    "OR maia_users.last_digest_sent IS NULL) " .
               "ORDER BY maia_users.id ASC";
     my $sth3 = $dbh->prepare($select)