[Checkins] SVN: relstorage/ Fix Oracle complaints and added minimal forward compatibility with the 1.5 schema.

Shane Hathaway shane at hathawaymix.org
Tue Feb 1 02:26:03 EST 2011


Log message for revision 120034:
  Fix Oracle complaints and added minimal forward compatibility with the 1.5 schema.
  

Changed:
  U   relstorage/branches/1.4/relstorage/adapters/packundo.py
  U   relstorage/branches/1.4/relstorage/adapters/schema.py
  U   relstorage/trunk/relstorage/adapters/packundo.py

-=-
Modified: relstorage/branches/1.4/relstorage/adapters/packundo.py
===================================================================
--- relstorage/branches/1.4/relstorage/adapters/packundo.py	2011-02-01 07:00:40 UTC (rev 120033)
+++ relstorage/branches/1.4/relstorage/adapters/packundo.py	2011-02-01 07:26:03 UTC (rev 120034)
@@ -884,7 +884,8 @@
 
             stmt = """
             SELECT object_state.zoid FROM object_state
-                LEFT JOIN object_refs_added USING (zoid)
+                LEFT JOIN object_refs_added
+                    ON (object_state.zoid = object_refs_added.zoid)
             WHERE object_refs_added.tid IS NULL
                 OR object_refs_added.tid != object_state.tid
             ORDER BY object_state.zoid

Modified: relstorage/branches/1.4/relstorage/adapters/schema.py
===================================================================
--- relstorage/branches/1.4/relstorage/adapters/schema.py	2011-02-01 07:00:40 UTC (rev 120033)
+++ relstorage/branches/1.4/relstorage/adapters/schema.py	2011-02-01 07:26:03 UTC (rev 120034)
@@ -640,6 +640,7 @@
         'transaction',
         'new_oid',
         'object_state',
+        'blob_chunk',  # Forward compat with RelStorage 1.5
         'current_object',
         'object_ref',
         'object_refs_added',
@@ -647,6 +648,7 @@
         'pack_state',
         'pack_state_tid',
         'temp_store',
+        'temp_blob_chunk',  # Forward compat with RelStorage 1.5
         'temp_pack_visit',
         'temp_undo',
         )

Modified: relstorage/trunk/relstorage/adapters/packundo.py
===================================================================
--- relstorage/trunk/relstorage/adapters/packundo.py	2011-02-01 07:00:40 UTC (rev 120033)
+++ relstorage/trunk/relstorage/adapters/packundo.py	2011-02-01 07:26:03 UTC (rev 120034)
@@ -892,7 +892,8 @@
 
             stmt = """
             SELECT object_state.zoid FROM object_state
-                LEFT JOIN object_refs_added USING (zoid)
+                LEFT JOIN object_refs_added
+                    ON (object_state.zoid = object_refs_added.zoid)
             WHERE object_refs_added.tid IS NULL
                 OR object_refs_added.tid != object_state.tid
             ORDER BY object_state.zoid



More information about the checkins mailing list