]> git.ipfire.org Git - pbs.git/commitdiff
Fix limit/offset syntax for PostgreSQL
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 13 Jan 2018 12:41:27 +0000 (12:41 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 13 Jan 2018 12:41:27 +0000 (12:41 +0000)
Fixes #11587

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/builds.py

index 6f9974c17a0ce304258683540ba5ed071d359f71..83d5f241e625aaa490dffe8d4e3b3ac0b2bb4198 100644 (file)
@@ -101,13 +101,8 @@ class Builds(base.Object):
                elif type == "scratch":
                        query += " ORDER BY time_created DESC"
 
-               if limit:
-                       if offset:
-                               query += " LIMIT %s,%s"
-                               args.extend([offset, limit])
-                       else:
-                               query += " LIMIT %s"
-                               args.append(limit)
+               query += " LIMIT %s OFFSET %s"
+               args.extend([offset, limit])
 
                return [Build(self.backend, b.id, b) for b in self.db.query(query, *args)]
 
@@ -262,13 +257,8 @@ class Builds(base.Object):
 
                query += " ORDER BY builds.time_created DESC"
 
-               if limit:
-                       if offset:
-                               query += " LIMIT %s,%s"
-                               args += [offset, limit]
-                       else:
-                               query += " LIMIT %s"
-                               args.append(limit)
+               query += " LIMIT %s OFFSET %s"
+               args += [offset, limit]
 
                builds = []
                for b in self.db.query(query, *args):
@@ -296,14 +286,8 @@ class Builds(base.Object):
                query += " ORDER BY time_created DESC"
 
                # Limits.
-               if limit:
-                       if offset:
-                               query += " LIMIT %s,%s"
-                               args.append(offset)
-                       else:
-                               query += " LIMIT %s"
-
-                       args.append(limit)
+               query += " LIMIT %s OFFSET %s"
+               args.extend([limit, offset])
 
                comments = []
                for comment in self.db.query(query, *args):