diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-10-02 11:00:22 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-10-02 11:00:22 -0400 |
| commit | 25c08f6def19e1034a887e972ad286ef122473d0 (patch) | |
| tree | ba691c6e57197bbb73ee298befa01950219390fa /lib/sqlalchemy/engine/base.py | |
| parent | 3d389b19b70b65cb76226c3f3aa4c5d926e1f12b (diff) | |
| parent | 19d5287d833110507d8ed7b64d31871f67d3f171 (diff) | |
| download | sqlalchemy-25c08f6def19e1034a887e972ad286ef122473d0.tar.gz | |
merge tip
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 73cd53137..ba4ef6037 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1070,7 +1070,7 @@ class Connection(Connectable): def _begin_impl(self): if self._echo: - self.engine.logger.info("BEGIN") + self.engine.logger.info("BEGIN (implicit)") try: self.engine.dialect.do_begin(self.connection) except Exception, e: @@ -2300,7 +2300,7 @@ class ResultProxy(object): self.context = context self.dialect = context.dialect self.closed = False - self.cursor = context.cursor + self.cursor = self._saved_cursor = context.cursor self.connection = context.root_connection self._echo = self.connection._echo and \ context.engine._should_log_debug() @@ -2355,12 +2355,12 @@ class ResultProxy(object): regardless of database backend. """ - return self.cursor.lastrowid + return self._saved_cursor.lastrowid def _cursor_description(self): """May be overridden by subclasses.""" - return self.cursor.description + return self._saved_cursor.description def _autoclose(self): """called by the Connection to autoclose cursors that have no pending |