From: Maxious <maxious@lambdacomplex.org>
Date: Sat, 01 Oct 2011 11:28:36 +0000
Subject: Escape keyword "end" for older versions of postgresql
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=e24f8341cedc10cf52832784e675803ce49d7cad
---
Escape keyword "end" for older versions of postgresql
---


--- a/include/db/servicealert-dao.inc.php
+++ b/include/db/servicealert-dao.inc.php
@@ -32,7 +32,7 @@
 
 function getServiceAlert($alertID) {
     global $conn;
-    $query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from end) as end,cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id";
+    $query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id";
     debug($query, "database");
     $query = $conn->prepare($query);
     $query->bindParam(":servicealert_id", $alertID);
@@ -87,7 +87,7 @@
 
 function getCurrentAlerts() {
     global $conn;
-    $query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from end) as end,cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < \"end\"";
+    $query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < \"end\"";
     // debug($query, "database");
     $query = $conn->prepare($query);
     $query->execute();
@@ -100,7 +100,7 @@
 
 function getFutureAlerts() {
     global $conn;
-    $query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from end) as end,cause,effect,header,description,url from servicealerts_alerts where NOW() > start or NOW() < \"end\"";
+    $query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start or NOW() < \"end\"";
     // debug($query, "database");
     $query = $conn->prepare($query);
     $query->execute();