From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 6 Dec 2010 22:05:32 +0000 (-0500)
Subject: oracle fixes
X-Git-Tag: rel_0_7b1~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=987828194ee571c39ed461a9233191d968e4f4c7;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

oracle fixes
---

diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 3bbf9d71a4..945641ef1f 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -286,7 +286,7 @@ class EchoTest(TestBase):
         
         # do an initial execute to clear out 'first connect'
         # messages
-        e.execute("select 10")
+        e.execute(select([10]))
         self.buf.flush()
         
         return e
@@ -563,7 +563,7 @@ class EngineEventsTest(TestBase):
         
         event.listen(engine, "on_before_execute", on_execute, retval=True)
         event.listen(engine, "on_before_cursor_execute", on_cursor_execute, retval=True)
-        engine.execute("select 1")
+        engine.execute(select([1]))
         eq_(
             canary, ['execute', 'cursor_execute']
         )
diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index 11fca582a3..57c40ccc12 100644
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -209,15 +209,18 @@ class PolymorphicAttributeManagementTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('table_a', metadata,
-            Column('id', Integer, primary_key=True),
+            Column('id', Integer, primary_key=True, 
+                                test_needs_autoincrement=True),
             Column('class_name', String(50))
         )
         Table('table_b', metadata,
-           Column('id', Integer, ForeignKey('table_a.id'), primary_key=True),
+           Column('id', Integer, ForeignKey('table_a.id'), 
+                                primary_key=True),
            Column('class_name', String(50))
         )
         Table('table_c', metadata,
-           Column('id', Integer, ForeignKey('table_b.id'),primary_key=True)
+           Column('id', Integer, ForeignKey('table_b.id'),
+                                primary_key=True)
         )
     
     @classmethod
@@ -280,22 +283,26 @@ class CascadeTest(_base.MappedTest):
     def define_tables(cls, metadata):
         global t1, t2, t3, t4
         t1= Table('t1', metadata,
-            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
+            Column('id', Integer, primary_key=True, 
+                                    test_needs_autoincrement=True),
             Column('data', String(30))
             )
 
         t2 = Table('t2', metadata,
-            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
+            Column('id', Integer, primary_key=True, 
+                                    test_needs_autoincrement=True),
             Column('t1id', Integer, ForeignKey('t1.id')),
             Column('type', String(30)),
             Column('data', String(30))
         )
         t3 = Table('t3', metadata,
-            Column('id', Integer, ForeignKey('t2.id'), primary_key=True),
+            Column('id', Integer, ForeignKey('t2.id'), 
+                                    primary_key=True),
             Column('moredata', String(30)))
 
         t4 = Table('t4', metadata,
-            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
+            Column('id', Integer, primary_key=True, 
+                                    test_needs_autoincrement=True),
             Column('t3id', Integer, ForeignKey('t3.id')),
             Column('data', String(30)))