Ticket #288: bitten-postgres8.3.patch

bitten/model.py

@@ -217 +217 @@
             handle_ta = False
 
         cursor = db.cursor()
-        cursor.execute("DELETE FROM bitten_rule WHERE id=%s", (self.id,))
+        cursor.execute("DELETE FROM bitten_rule WHERE id=%s", (str(self.id),))
         cursor.execute("DELETE FROM bitten_platform WHERE id=%s", (self.id,))
         if handle_ta:
             db.commit()
@@ -241 +241 @@
         self.id = db.get_last_id(cursor, 'bitten_platform')
         if self.rules:
             cursor.executemany("INSERT INTO bitten_rule VALUES (%s,%s,%s,%s)",
-                               [(self.id, propname, pattern, idx)
+                               [(str(self.id), propname, pattern, idx)
                                 for idx, (propname, pattern)
                                 in enumerate(self.rules)])
 
@@ -263 +263 @@
         cursor = db.cursor()
         cursor.execute("UPDATE bitten_platform SET name=%s WHERE id=%s",
                        (self.name, self.id))
-        cursor.execute("DELETE FROM bitten_rule WHERE id=%s", (self.id,))
+        cursor.execute("DELETE FROM bitten_rule WHERE id=%s", (str(self.id),))
         if self.rules:
             cursor.executemany("INSERT INTO bitten_rule VALUES (%s,%s,%s,%s)",
-                               [(self.id, propname, pattern, idx)
+                               [(str(self.id), propname, pattern, idx)
                                 for idx, (propname, pattern)
                                 in enumerate(self.rules)])
 
@@ -288 +288 @@
         platform = TargetPlatform(env, config=row[0], name=row[1])
         platform.id = id
         cursor.execute("SELECT propname,pattern FROM bitten_rule "
-                       "WHERE id=%s ORDER BY orderno", (id,))
+                       "WHERE id=%s ORDER BY orderno", (str(id),))
         for propname, pattern in cursor:
             platform.rules.append((propname, pattern))
         return platform
@@ -417 +417 @@
         cursor.execute("INSERT INTO bitten_build (config,rev,rev_time,platform,"
                        "slave,started,stopped,status) "
                        "VALUES (%s,%s,%s,%s,%s,%s,%s,%s)",
-                       (self.config, self.rev, int(self.rev_time),
+                       (self.config, str(self.rev), int(self.rev_time),
                         self.platform, self.slave or '', self.started or 0,
                         self.stopped or 0, self.status))
         self.id = db.get_last_id(cursor, 'bitten_build')
@@ -494 +494 @@
         if config is not None:
             where_clauses.append(("config=%s", config))
         if rev is not None:
-            where_clauses.append(("rev=%s", rev))
+            where_clauses.append(("rev=%s", str(rev)))
         if platform is not None:
             where_clauses.append(("platform=%s", platform))
         if slave is not None:

bitten/tests/model.py

@@ -186 +186 @@
         self.assertEqual(('test', 'Windows XP'), cursor.fetchone())
 
         cursor.execute("SELECT propname,pattern,orderno FROM bitten_rule "
-                       "WHERE id=%s", (platform.id,))
+                       "WHERE id=%s", (str(platform.id),))
         self.assertEqual((Build.OS_NAME, 'Windows', 0), cursor.fetchone())
         self.assertEqual((Build.OS_VERSION, 'XP', 1), cursor.fetchone())