diff options
| author | Michael Trier <mtrier@gmail.com> | 2010-12-19 23:17:55 -0500 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.com> | 2010-12-19 23:17:55 -0500 |
| commit | 920dcbe855a3bfc3b1d714b86538b3c8a3703d4a (patch) | |
| tree | 0a26194b9df188c4d8859f34c92e5219b6f9ee3a /lib/sqlalchemy/dialects | |
| parent | c0ddbf502f6094b1ace96b51f230e46e6507f37e (diff) | |
| parent | d8c5474db69c16a15e0e3a5b3da6d2703aa4d236 (diff) | |
| download | sqlalchemy-920dcbe855a3bfc3b1d714b86538b3c8a3703d4a.tar.gz | |
merge tip
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/zxjdbc.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/psycopg2.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index b7d663138..d705067d0 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -327,7 +327,7 @@ class OracleExecutionContext_cx_oracle(OracleExecutionContext): self.out_parameters[name] def create_cursor(self): - c = self._connection.connection.cursor() + c = self._dbapi_connection.cursor() if self.dialect.arraysize: c.arraysize = self.dialect.arraysize diff --git a/lib/sqlalchemy/dialects/oracle/zxjdbc.py b/lib/sqlalchemy/dialects/oracle/zxjdbc.py index d742654a0..67139f5d9 100644 --- a/lib/sqlalchemy/dialects/oracle/zxjdbc.py +++ b/lib/sqlalchemy/dialects/oracle/zxjdbc.py @@ -109,7 +109,7 @@ class OracleExecutionContext_zxjdbc(OracleExecutionContext): return base.ResultProxy(self) def create_cursor(self): - cursor = self._connection.connection.cursor() + cursor = self._dbapi_connection.cursor() cursor.datahandler = self.dialect.DataHandler(cursor.datahandler) return cursor diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py index 7edf1e16a..412a4e8a4 100644 --- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py +++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py @@ -171,9 +171,9 @@ class PGExecutionContext_psycopg2(PGExecutionContext): # use server-side cursors: # http://lists.initd.org/pipermail/psycopg/2007-January/005251.html ident = "c_%s_%s" % (hex(id(self))[2:], hex(random.randint(0, 65535))[2:]) - return self._connection.connection.cursor(ident) + return self._dbapi_connection.cursor(ident) else: - return self._connection.connection.cursor() + return self._dbapi_connection.cursor() def get_result_proxy(self): # TODO: ouch |