Remove ms_current_timestamp() override function.

This override is not used anywhere, it dates from a very old long-gone
test script, and causes issues with database query planning.

5 files changed, 15 insertions, 15 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Alert.pm b/perllib/FixMyStreet/DB/ResultSet/Alert.pm
index 5848265f1..bb1c61141 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Alert.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Alert.pm
@@ -14,7 +14,7 @@ sub timeline_created {
 
     return $rs->search(
         {
-            whensubscribed => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
+            whensubscribed => { '>=', \"current_timestamp-'7 days'::interval" },
             confirmed => 1,
             %{ $restriction },
         },
@@ -29,7 +29,7 @@ sub timeline_disabled {
 
     return $rs->search(
         {
-            whendisabled => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
+            whendisabled => { '>=', \"current_timestamp-'7 days'::interval" },
             %{ $restriction },
         },
     );
diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
index 0b430008a..9bb1e81fe 100644
--- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
@@ -41,7 +41,7 @@ sub email_alerts ($) {
         }
         $query .= "
             where alert_type='$ref' and whendisabled is null and $item_table.confirmed >= whensubscribed
-            and $item_table.confirmed >= ms_current_timestamp() - '7 days'::interval
+            and $item_table.confirmed >= current_timestamp - '7 days'::interval
              and (select whenqueued from alert_sent where alert_sent.alert_id = alert.id and alert_sent.parameter::integer = $item_table.id) is null
             and $item_table.user_id <> alert.user_id
             and " . $alert_type->item_where . "
@@ -184,7 +184,7 @@ sub email_alerts ($) {
             and problem.user_id = users.id
             and problem.state in ($states)
             and problem.non_public = 'f'
-            and problem.confirmed >= ? and problem.confirmed >= ms_current_timestamp() - '7 days'::interval
+            and problem.confirmed >= ? and problem.confirmed >= current_timestamp - '7 days'::interval
             and (select whenqueued from alert_sent where alert_sent.alert_id = ? and alert_sent.parameter::integer = problem.id) is null
             and users.email <> ?
             order by confirmed desc";
diff --git a/perllib/FixMyStreet/DB/ResultSet/Comment.pm b/perllib/FixMyStreet/DB/ResultSet/Comment.pm
index 70f8027aa..abdc46868 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Comment.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Comment.pm
@@ -15,7 +15,7 @@ sub timeline {
     return $rs->search(
         {
             state => 'confirmed',
-            created => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
+            created => { '>=', \"current_timestamp-'7 days'::interval" },
             %{ $restriction },
         },
         {
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 7885c28b3..611c1582e 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -168,9 +168,9 @@ sub timeline {
     return $rs->search(
         {
             -or => {
-                created  => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
-                confirmed => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
-                whensent  => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
+                created  => { '>=', \"current_timestamp-'7 days'::interval" },
+                confirmed => { '>=', \"current_timestamp-'7 days'::interval" },
+                whensent  => { '>=', \"current_timestamp-'7 days'::interval" },
             }
         },
         {
@@ -433,8 +433,8 @@ sub send_reports {
 
         unless ($result) {
             $row->update( {
-                whensent => \'ms_current_timestamp()',
-                lastupdate => \'ms_current_timestamp()',
+                whensent => \'current_timestamp',
+                lastupdate => \'current_timestamp',
             } );
             if ( $cobrand->report_sent_confirmation_email && !$h{anonymous_report}) {
                 _send_report_sent_email( $row, \%h, $nomail, $cobrand );
diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
index 63a91697d..1b89b2e65 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
@@ -22,7 +22,7 @@ sub send_questionnaires_period {
         whensent => [
             '-and',
             { '!=', undef },
-            { '<', \"ms_current_timestamp() - '$period'::interval" },
+            { '<', \"current_timestamp - '$period'::interval" },
         ],
         send_questionnaire => 1,
     };
@@ -34,7 +34,7 @@ sub send_questionnaires_period {
     } else {
         $q_params->{'-or'} = [
             '(select max(whensent) from questionnaire where me.id=problem_id)' => undef,
-            '(select max(whenanswered) from questionnaire where me.id=problem_id)' => { '<', \"ms_current_timestamp() - '$period'::interval" }
+            '(select max(whenanswered) from questionnaire where me.id=problem_id)' => { '<', \"current_timestamp - '$period'::interval" }
         ];
     }
 
@@ -70,7 +70,7 @@ sub send_questionnaires_period {
 
         my $questionnaire = FixMyStreet::App->model('DB::Questionnaire')->create( {
             problem_id => $row->id,
-            whensent => \'ms_current_timestamp()',
+            whensent => \'current_timestamp',
         } );
 
         # We won't send another questionnaire unless they ask for it (or it was
@@ -120,8 +120,8 @@ sub timeline {
     return $rs->search(
         {
             -or => {
-                whenanswered => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
-                'me.whensent'  => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
+                whenanswered => { '>=', \"current_timestamp-'7 days'::interval" },
+                'me.whensent'  => { '>=', \"current_timestamp-'7 days'::interval" },
             },
             %{ $restriction },
         },