]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- additional oracle fixes. cx_oracle under py3k is complaining about tuples to execu...
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 27 May 2013 21:06:05 +0000 (17:06 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 27 May 2013 21:06:05 +0000 (17:06 -0400)
so just unconditionally turn this into a list
- this one test segfaults only on py3k + cx_oracle

lib/sqlalchemy/dialects/oracle/cx_oracle.py
test/engine/test_reconnect.py

index 5b0c3edd73717eb5be8297ee85981af22284d404..e013799dbd57d28b9b06f86f64ac0b5c16bdb946 100644 (file)
@@ -819,6 +819,11 @@ class OracleDialect_cx_oracle(OracleDialect):
         id = random.randint(0, 2 ** 128)
         return (0x1234, "%032x" % id, "%032x" % 9)
 
+    def do_executemany(self, cursor, statement, parameters, context=None):
+        if isinstance(parameters, tuple):
+            parameters = list(parameters)
+        cursor.executemany(statement, parameters)
+
     def do_begin_twophase(self, connection, xid):
         connection.connection.begin(*xid)
 
index 3dec01c6978e0ed9e4072becf41ad44b63c25197..ee3ff14599e8eefc298ace439b38850374ea8dbd 100644 (file)
@@ -7,7 +7,7 @@ import sqlalchemy as tsa
 from sqlalchemy import testing
 from sqlalchemy.testing import engines
 from sqlalchemy.testing.util import gc_collect
-from sqlalchemy import exc
+from sqlalchemy import exc, util
 from sqlalchemy.testing import fixtures
 from sqlalchemy.testing.engines import testing_engine
 
@@ -464,6 +464,9 @@ class RealReconnectTest(fixtures.TestBase):
         conn.invalidate()
         conn.invalidate()
 
+    @testing.skip_if(
+        [lambda: util.py3k, "oracle+cx_oracle"],
+        "Crashes on py3k+cx_oracle")
     def test_explode_in_initializer(self):
         engine = engines.testing_engine()
         def broken_initialize(connection):