diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-06 11:49:45 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-06 11:49:45 -0400 |
| commit | 4e2c0f10cd164511b9c6377b72a8c0527e4eb716 (patch) | |
| tree | 830319060dc68ec7de0eaa04eaf8ba8e7948d535 /lib/sqlalchemy/engine | |
| parent | d9dc05adb689bc4eab2227a96af0d874696cc63d (diff) | |
| parent | 30bc42403754110df1fdec3037c7700cc4f26b70 (diff) | |
| download | sqlalchemy-4e2c0f10cd164511b9c6377b72a8c0527e4eb716.tar.gz | |
- merge tip
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/__init__.py | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py index 43d3dd038..36b86cabf 100644 --- a/lib/sqlalchemy/engine/__init__.py +++ b/lib/sqlalchemy/engine/__init__.py @@ -278,14 +278,15 @@ def _coerce_config(configuration, prefix): for key in configuration if key.startswith(prefix)) for option, type_ in ( - ('convert_unicode', bool), + ('convert_unicode', util.bool_or_str('force')), ('pool_timeout', int), - ('echo', bool), - ('echo_pool', bool), + ('echo', util.bool_or_str('debug')), + ('echo_pool', util.bool_or_str('debug')), ('pool_recycle', int), ('pool_size', int), ('max_overflow', int), ('pool_threadlocal', bool), + ('use_native_unicode', bool), ): util.coerce_kw_type(options, option, type_) return options diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 390094c7d..13755d49a 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -565,7 +565,6 @@ class DefaultExecutionContext(base.ExecutionContext): in all cases. """ - return self.cursor.lastrowid def handle_dbapi_exception(self, e): |