diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/connectors/pyodbc.py | 1 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/persistence.py | 24 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/requirements.py | 23 |
4 files changed, 43 insertions, 9 deletions
diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py index 65fe37212..66acf0072 100644 --- a/lib/sqlalchemy/connectors/pyodbc.py +++ b/lib/sqlalchemy/connectors/pyodbc.py @@ -16,6 +16,7 @@ import re class PyODBCConnector(Connector): driver = 'pyodbc' + supports_sane_rowcount_returning = False supports_sane_multi_rowcount = False if util.py2k: diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index d1b54ab01..8b72c0001 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -249,6 +249,10 @@ class DefaultDialect(interfaces.Dialect): def dialect_description(self): return self.name + "+" + self.driver + @property + def supports_sane_rowcount_returning(self): + return self.supports_sane_rowcount + @classmethod def get_pool_class(cls, url): return getattr(cls, 'poolclass', pool.QueuePool) diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index faacd018e..24c9743d4 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -693,22 +693,28 @@ def _emit_update_statements(base_mapper, uowtransaction, records = list(records) statement = cached_stmt - - # TODO: would be super-nice to not have to determine this boolean - # inside the loop here, in the 99.9999% of the time there's only - # one connection in use - assert_singlerow = connection.dialect.supports_sane_rowcount - assert_multirow = assert_singlerow and \ - connection.dialect.supports_sane_multi_rowcount - allow_multirow = has_all_defaults and not needs_version_id + return_defaults = False if not has_all_pks: statement = statement.return_defaults() + return_defaults = True elif bookkeeping and not has_all_defaults and \ mapper.base_mapper.eager_defaults: statement = statement.return_defaults() + return_defaults = True elif mapper.version_id_col is not None: statement = statement.return_defaults(mapper.version_id_col) + return_defaults = True + + assert_singlerow = ( + connection.dialect.supports_sane_rowcount + if not return_defaults + else connection.dialect.supports_sane_rowcount_returning + ) + + assert_multirow = assert_singlerow and \ + connection.dialect.supports_sane_multi_rowcount + allow_multirow = has_all_defaults and not needs_version_id if hasvalue: for state, state_dict, params, mapper, \ @@ -728,7 +734,7 @@ def _emit_update_statements(base_mapper, uowtransaction, c.context.compiled_parameters[0], value_params) rows += c.rowcount - check_rowcount = True + check_rowcount = assert_singlerow else: if not allow_multirow: check_rowcount = assert_singlerow diff --git a/lib/sqlalchemy/testing/requirements.py b/lib/sqlalchemy/testing/requirements.py index 08a7b1ced..327362bf6 100644 --- a/lib/sqlalchemy/testing/requirements.py +++ b/lib/sqlalchemy/testing/requirements.py @@ -193,6 +193,29 @@ class SuiteRequirements(Requirements): return exclusions.open() + + @property + def sane_rowcount(self): + return exclusions.skip_if( + lambda config: not config.db.dialect.supports_sane_rowcount, + "driver doesn't support 'sane' rowcount" + ) + + @property + def sane_multi_rowcount(self): + return exclusions.fails_if( + lambda config: not config.db.dialect.supports_sane_multi_rowcount, + "driver %(driver)s %(doesnt_support)s 'sane' multi row count" + ) + + @property + def sane_rowcount_w_returning(self): + return exclusions.fails_if( + lambda config: + not config.db.dialect.supports_sane_rowcount_returning, + "driver doesn't support 'sane' rowcount when returning is on" + ) + @property def empty_inserts(self): """target platform supports INSERT with no values, i.e. |