diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-01-15 16:42:29 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-01-15 16:42:29 -0500 |
| commit | dff5a404e489d5215da5aa30870b78aca8423de5 (patch) | |
| tree | 39f6ae1949762d269f6a73e0315f0fa6910ceacd /lib/sqlalchemy/engine/default.py | |
| parent | fc0ffac24155931c2db10d1a469e1f7898268e45 (diff) | |
| download | sqlalchemy-dff5a404e489d5215da5aa30870b78aca8423de5.tar.gz | |
- getting slightly more consistent behavior for the edge case of pk columns
with server default - autoincrement is now false with any server_default,
so these all return None, applies consistency to [ticket:2020], [ticket:2021].
if prefetch is desired a "default" should be used instead of server_default.
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index e21ec1c40..da6ed12a6 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -101,7 +101,7 @@ class DefaultDialect(base.Dialect): if not getattr(self, 'ported_sqla_06', True): util.warn( - "The %s dialect is not yet ported to SQLAlchemy 0.6" % + "The %s dialect is not yet ported to SQLAlchemy 0.6/0.7" % self.name) self.convert_unicode = convert_unicode @@ -625,7 +625,8 @@ class DefaultExecutionContext(base.ExecutionContext): return self.dialect.supports_sane_multi_rowcount def post_insert(self): - if self.dialect.postfetch_lastrowid and \ + if not self._is_implicit_returning and \ + self.dialect.postfetch_lastrowid and \ (not self.inserted_primary_key or \ None in self.inserted_primary_key): |