From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Oct 2017 11:33:22 +0000 (+0100)
Subject: Translate a few SQL statements from MySQL to PostgreSQL syntax
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9779008cb523001f2f9fd34332b2af59136e56a0;p=pbs.git

Translate a few SQL statements from MySQL to PostgreSQL syntax

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 53f2d44b..0c707a83 100644
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -1474,7 +1474,7 @@ class Jobs(base.Object):
 				args += (date, date, date)
 
 		if age:
-			where.append("time_finished >= DATE_SUB(NOW(), INTERVAL %s)" % age)
+			where.append("time_finished >= NOW() - '%s'::interval" % age)
 
 		if where:
 			query += " WHERE %s" % " AND ".join(where)
@@ -1494,7 +1494,7 @@ class Jobs(base.Object):
 		"""
 		result = self.db.get("SELECT AVG(time_finished - time_started) as average \
 			FROM jobs WHERE type = 'build' AND state = 'finished' AND \
-			time_finished >= DATE_SUB(NOW(), INTERVAL 3 MONTH)")
+			time_finished >= NOW() - '3 months'::interval")
 
 		if result:
 			return result.average
diff --git a/src/manager/builds.py b/src/manager/builds.py
index 0e230ba0..d6d0c129 100644
--- a/src/manager/builds.py
+++ b/src/manager/builds.py
@@ -32,7 +32,7 @@ class BuildsFailedRestartEvent(base.Event):
 				jobs.state = 'failed' AND \
 				jobs.tries <= %s AND \
 				NOT builds.state = 'broken' AND \
-				jobs.time_finished < DATE_SUB(NOW(), INTERVAL 72 HOUR) \
+				jobs.time_finished < NOW() - '72 hours'::interval \
 			ORDER BY \
 				CASE \
 					WHEN jobs.type = 'build' THEN 0 \
@@ -60,7 +60,7 @@ class CheckBuildDependenciesEvent(base.Event):
 		query = self.db.query("SELECT id FROM jobs \
 			WHERE state = 'new' OR \
 				(state = 'dependency_error' AND \
-				time_finished < DATE_SUB(NOW(), INTERVAL 5 MINUTE)) \
+				time_finished < NOW() - '5 minutes'::interval) \
 			ORDER BY time_finished LIMIT 50")
 
 		for row in query:
diff --git a/src/web/handlers.py b/src/web/handlers.py
index ec75b179..844dcbb8 100644
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -19,7 +19,7 @@ class IndexHandler(BaseHandler):
 	def get(self):
 		jobs = self.pakfire.jobs.get_active()
 		jobs += self.pakfire.jobs.get_next()
-		jobs += self.pakfire.jobs.get_latest(age="24 HOUR", limit=5)
+		jobs += self.pakfire.jobs.get_latest(age="24 hours", limit=5)
 
 		# Updates
 		updates = []