Changeset 178 in tracdarcs

Timestamp:

05/12/10 18:40:53 (21 months ago)

Author:

lele@…

Hash name:

20100512164053-97f81-e69d930ef723d57a771c19c6a23bc5ed9781b30a

Message:

Use a parametrized query

Location:

tracdarcs

Files:

• dbutil.py (modified) (2 diffs)
• repository.py (modified) (2 diffs)
• updatedb.py (modified) (2 diffs)

tracdarcs/dbutil.py

@@ -35 +35 @@
 IS_TRAC_0_12_OR_BETTER = not not re.match(r'^0\.1[2-9]', tracVersion)
 
-def query_nodes_for_revision(repo_id, rev=None):
+def query_nodes_for_revision(repo_id, rev=None, cond=None):
     '''
     Returns a query which represents the nodes available as of
@@ -44 +44 @@
     if rev is None:
         revfilter = "dn.remove_rev IS NULL"
+        revargs = []
     else:
-        revfilter = ("dnc2.rev <= %d"
-                     " AND ((dn.remove_rev IS NULL) "
-                     "      OR (dn.remove_rev > %d))" % (rev,rev))
+        revfilter = ("dnc2.rev <= %s"
+                     " AND ((dn.remove_rev IS NULL)"
+                     " OR (dn.remove_rev > %s))")
+        revargs = [rev, rev]
+    if cond is None:
+        cond = ''
+    else:
+        cond = 'AND %s' % cond
     q = """SELECT dnc.node_id, dnc.rev, dnc.path, dnc.parent_id
            FROM darcs_node_changes AS dnc
-           WHERE dnc.repo_id = %s
+           WHERE dnc.repo_id = %%s
              AND dnc.rev = (SELECT max(dnc2.rev)
-                            FROM darcs_node_changes AS dnc2, darcs_nodes AS dn
+                            FROM darcs_node_changes AS dnc2
+                              JOIN darcs_nodes AS dn
+                                   ON dn.repo_id = dnc2.repo_id
+                                      AND dn.node_id = dnc2.node_id
                             WHERE dnc2.repo_id = dnc.repo_id
                               AND dnc2.node_id = dnc.node_id
-                              AND dn.repo_id = dnc2.repo_id
-                              AND dn.node_id = dnc2.node_id
-                              AND %s)""" % (repo_id, revfilter)
-    return q
+                              AND %s)
+             %s""" % (revfilter, cond)
+    return q, [repo_id] + revargs
 
 def get_node_type(db, repo_id, node_id):

tracdarcs/repository.py

@@ -95 +95 @@
         else:
             c = self.db.cursor()
-            q = query_nodes_for_revision(self.id, rev)
-            q += ' AND dnc.path = %s'
-            c.execute(q, (path,))
+            q,args = query_nodes_for_revision(self.id, rev, 'dnc.path = %s')
+            args.append(path)
+            c.execute(q, args)
             row = c.fetchone()
             if row is None:
@@ -334 +334 @@
         if self.__node_type == NODE_FILE_TYPE:
             return
-        q = query_nodes_for_revision(self.repos.id, self.rev)
         if self.__node_id is None:
-            q += ' AND dnc.parent_id IS NULL'
-        else:
-            q += ' AND dnc.parent_id = %d' % self.__node_id
-        c = self.repos.db.cursor()
-        c.execute(q)
+            cond = 'dnc.parent_id IS NULL'
+        else:
+            cond = 'dnc.parent_id = %d' % self.__node_id
+        q,args = query_nodes_for_revision(self.repos.id, self.rev, cond)
+        c = self.repos.db.cursor()
+        c.execute(q, args)
         for node_id,rev,path,_ in c:
             node_type = get_node_type(self.repos.db, self.repos.id, node_id)

tracdarcs/updatedb.py

@@ -252 +252 @@
         if path in self.ignore_paths_in_db:
             return None
-        q = query_nodes_for_revision(self.repo_id)
-        q += ' AND dnc.path = %s'
-        c = self.db.cursor()
-        c.execute(q, (path,))
+        q,args = query_nodes_for_revision(self.repo_id, cond='dnc.path = %s')
+        args.append(path)
+        c = self.db.cursor()
+        c.execute(q, args)
         row = c.fetchone()
         if row is None:
@@ -279 +279 @@
                 out.append(info)
         c = self.db.cursor()
-        q = query_nodes_for_revision(self.repo_id)
-        q += ' AND dnc.path LIKE %s'
-        c.execute(q, (path+'/%',))
+        q,args = query_nodes_for_revision(self.repo_id, cond='dnc.path LIKE %s')
+        args.append(path+'/%')
+        c.execute(q, args)
         for row in c:
             node_id,rev,path,parent_id = row