Ticket #5585: bugzilla_3.0_compatibility.patch

bugzilla2trac.

@@ -427 +427 @@
 
     def getFieldName(self, cursor, fieldid):
         if fieldid not in self.fieldNameCache:
-            cursor.execute("SELECT * FROM fielddefs WHERE fieldid = %s",
+            if BZ_VERSION >= 3000:
+              cursor.execute("SELECT * FROM fielddefs WHERE id = %s",
+                           (fieldid))
+            else:
+              cursor.execute("SELECT * FROM fielddefs WHERE fieldid = %s",
                            (fieldid))
             fieldName = cursor.fetchall()
 
@@ -812 +816 @@
         ticketid = trac.addTicket(**ticket)
 
         if BZ_VERSION >= 2180:
-            mysql_cur.execute("SELECT attachments.*, attach_data.thedata FROM attachments, attach_data
-                    WHERE attachments.bug_id = %s AND attachments.attach_id = attach_data.id" % bugid)
+            mysql_cur.execute("SELECT attachments.*, attach_data.thedata FROM attachments, attach_data WHERE attachments.bug_id = %s AND attachments.attach_id = attach_data.id" % bugid)
         else:
             mysql_cur.execute("SELECT * FROM attachments WHERE bug_id = %s" % bugid)
         attachments = mysql_cur.fetchall()