[Checkins] SVN: relstorage/trunk/relstorage/adapters/mover.py fixed more Oracle syntax

Shane Hathaway shane at hathawaymix.org
Wed Oct 20 03:49:12 EDT 2010


Log message for revision 117791:
  fixed more Oracle syntax

Changed:
  U   relstorage/trunk/relstorage/adapters/mover.py

-=-
Modified: relstorage/trunk/relstorage/adapters/mover.py
===================================================================
--- relstorage/trunk/relstorage/adapters/mover.py	2010-10-20 07:23:13 UTC (rev 117790)
+++ relstorage/trunk/relstorage/adapters/mover.py	2010-10-20 07:49:11 UTC (rev 117791)
@@ -1037,18 +1037,15 @@
                 DELETE FROM blob_chunk
                 WHERE zoid = %s AND tid = %s
                 """
-                cursor.execute(delete_stmt, (oid, tid))
+                delete_args = (oid, tid)
 
                 insert_stmt = """
                 INSERT INTO blob_chunk (zoid, tid, chunk_num, chunk)
                 VALUES (%s, %s, %s, CHUNK)
                 """
             else:
-                delete_stmt = """
-                DELETE FROM blob_chunk
-                WHERE zoid = %s
-                """
-                cursor.execute(delete_stmt, (oid,))
+                delete_stmt = "DELETE FROM blob_chunk WHERE zoid = %s"
+                delete_args = (oid,)
 
                 insert_stmt = """
                 INSERT INTO blob_chunk (zoid, tid, chunk_num, chunk)
@@ -1057,7 +1054,7 @@
         else:
             use_tid = False
             delete_stmt = "DELETE FROM temp_blob_chunk WHERE zoid = %s"
-            cursor.execute(delete_stmt, (oid,))
+            delete_args = (oid,)
 
             insert_stmt = """
             INSERT INTO temp_blob_chunk (zoid, chunk_num, chunk)
@@ -1077,6 +1074,8 @@
                 delete_stmt = delete_stmt.replace('%s', ':%d' % n, 1)
                 insert_stmt = insert_stmt.replace('%s', ':%d' % n, 1)
 
+        cursor.execute(delete_stmt, delete_args)
+
         f = open(filename, 'rb')
         try:
             chunk_num = 0



More information about the checkins mailing list