From: Philip Jenvey <pjenvey@underboss.org>
Date: Tue, 26 Jan 2010 06:17:02 +0000 (+0000)
Subject: oracle compat
X-Git-Tag: rel_0_6beta1~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d22a984be7b84b6afad09fb8013c08ad3aad8c8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

oracle compat
---

diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 945fe36c06..c29391dc46 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -92,6 +92,7 @@ class ExecuteTest(TestBase):
         ])
 
 class ProxyConnectionTest(TestBase):
+
     @testing.fails_on('firebird', 'Data type unknown')
     def test_proxy(self):
         
@@ -185,10 +186,10 @@ class ProxyConnectionTest(TestBase):
         engine = engines.testing_engine(options={'proxy':TrackProxy()})
         conn = engine.connect()
         trans = conn.begin()
-        conn.execute("select 1")
+        conn.execute(select([1]))
         trans.rollback()
         trans = conn.begin()
-        conn.execute("select 1")
+        conn.execute(select([1]))
         trans.commit()
         
         eq_(track, ['begin', 'execute', 'cursor_execute', 
@@ -211,15 +212,15 @@ class ProxyConnectionTest(TestBase):
         
         trans = conn.begin()
         trans2 = conn.begin_nested()
-        conn.execute("select 1")
+        conn.execute(select([1]))
         trans2.rollback()
         trans2 = conn.begin_nested()
-        conn.execute("select 1")
+        conn.execute(select([1]))
         trans2.commit()
         trans.rollback()
         
         trans = conn.begin_twophase()
-        conn.execute("select 1")
+        conn.execute(select([1]))
         trans.prepare()
         trans.commit()
 
diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
index 937af75994..8af646a3b1 100644
--- a/test/engine/test_pool.py
+++ b/test/engine/test_pool.py
@@ -76,7 +76,7 @@ class PoolTest(PoolTestBase):
     def test_cursor_iterable(self):
         conn = testing.db.raw_connection()
         cursor = conn.cursor()
-        cursor.execute("select 1")
+        cursor.execute(select([1]).compile(testing.db))
         expected = [(1,)]
         for row in cursor:
             eq_(row, expected.pop(0))
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 2499571736..a58d65e68a 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -768,8 +768,8 @@ class TLTransactionTest(TestBase):
     def test_result_closing(self):
         """tests that contextual_connect is threadlocal"""
         
-        r1 = tlengine.execute("select 1")
-        r2 = tlengine.execute("select 1")
+        r1 = tlengine.execute(select([1]))
+        r2 = tlengine.execute(select([1]))
         row1 = r1.fetchone()
         row2 = r2.fetchone()
         r1.close()
@@ -791,9 +791,9 @@ class TLTransactionTest(TestBase):
     
     def test_dispose(self):
         eng = create_engine(testing.db.url, strategy='threadlocal')
-        result = eng.execute("select 1")
+        result = eng.execute(select([1]))
         eng.dispose()
-        eng.execute("select 1")
+        eng.execute(select([1]))
         
         
     @testing.requires.two_phase_transactions
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 4b7cba73c2..0dcf4470fb 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -279,6 +279,7 @@ class UnicodeTest(TestBase, AssertsExecutionResults):
                 ('mysql','oursql'),
                 ('mysql','zxjdbc'),
                 ('sqlite','pysqlite'),
+                ('oracle','zxjdbc'),
             )), \
             "name: %s driver %s returns_unicode_strings=%s" % \
                                         (testing.db.name,