- Adjusted the format of create_xid() to repair

two-phase commit.   We now have field reports
of Oracle two-phase commit working properly
with this change.

diff --git a/CHANGES b/CHANGES
index 7ae9e7b60c5fe1a2ff95c8fea94c805d594f6e19..4ec043e9728f05bd0bcb345d3a2b88f000c9aa6d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -135,6 +135,12 @@ CHANGES
 - postgres
     - Calling alias.execute() in conjunction with
       server_side_cursors won't raise AttributeError.
+
+- oracle
+    - Adjusted the format of create_xid() to repair
+      two-phase commit.   We now have field reports
+      of Oracle two-phase commit working properly
+      with this change.
       
 0.5.0rc4
 ========

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 9871f6e0e7a416eacaad2872f9425f5b34044253..d71b129d1fe8b5ddcef4d7002e0b9a70bb05dbfd 100644 (file)
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -441,8 +441,8 @@ class OracleDialect(default.DefaultDialect):
         do_commit_twophase().  its format is unspecified."""
 
         id = random.randint(0, 2 ** 128)
-        return (0x1234, "%032x" % 9, "%032x" % id)
-
+        return (0x1234, "%032x" % id, "%032x" % 9)
+        
     def do_release_savepoint(self, connection, name):
         # Oracle does not support RELEASE SAVEPOINT
         pass

diff --git a/test/orm/inheritance/concrete.py b/test/orm/inheritance/concrete.py
index c523232c945c2ced9ff55748ded9b0582c5a8db0..a72bee7eeaa8ad9f1bd1ee588d9b70ee9877deda 100644 (file)
--- a/test/orm/inheritance/concrete.py
+++ b/test/orm/inheritance/concrete.py
@@ -82,8 +82,10 @@ class ConcreteTest(ORMTest):
         }, 'type', 'pjoin')
 
         employee_mapper = mapper(Employee, pjoin, polymorphic_on=pjoin.c.type)
-        manager_mapper = mapper(Manager, managers_table, inherits=employee_mapper, concrete=True, polymorphic_identity='manager')
-        engineer_mapper = mapper(Engineer, engineers_table, inherits=employee_mapper, concrete=True, polymorphic_identity='engineer')
+        manager_mapper = mapper(Manager, managers_table, inherits=employee_mapper, 
+            concrete=True, polymorphic_identity='manager')
+        engineer_mapper = mapper(Engineer, engineers_table, inherits=employee_mapper, 
+            concrete=True, polymorphic_identity='engineer')
 
         session = create_session()
         session.save(Manager('Tom', 'knows how to manage things'))
@@ -162,7 +164,8 @@ class ConcreteTest(ORMTest):
             'hacker': hackers_table
         }, 'type', 'pjoin2')
 
-        employee_mapper = mapper(Employee, employees_table, with_polymorphic=('*', pjoin), polymorphic_on=pjoin.c.type)
+        employee_mapper = mapper(Employee, employees_table, 
+                with_polymorphic=('*', pjoin), polymorphic_on=pjoin.c.type)
         manager_mapper = mapper(Manager, managers_table, 
                                 inherits=employee_mapper, concrete=True, 
                                 polymorphic_identity='manager')