summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-05-26 10:56:23 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-05-26 10:56:23 -0400
commita50dcb31b9757ca7602b85458615b7c267454cf9 (patch)
treee124f54ca5d0e0d229b14a5effe6b0563f086cd0 /lib/sqlalchemy/engine
parent88f547900276ff969ca25d24287fd5f96eeec49c (diff)
downloadsqlalchemy-a50dcb31b9757ca7602b85458615b7c267454cf9.tar.gz
- Fixed bug where known boolean values used by
:func:`.engine_from_config` were not being parsed correctly; these included ``pool_threadlocal`` and the psycopg2 argument ``use_native_unicode``. fixes #3435 - add legacy_schema_aliasing config parsing for mssql - move use_native_unicode config arg to the psycopg2 dialect
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/__init__.py6
-rw-r--r--lib/sqlalchemy/engine/default.py11
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index 0678dd201..f1eacf6a6 100644
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -394,9 +394,9 @@ def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
'prefix' argument indicates the prefix to be searched for.
A select set of keyword arguments will be "coerced" to their
- expected type based on string values. In a future release, this
- functionality will be expanded and include dialect-specific
- arguments.
+ expected type based on string values. The set of arguments
+ is extensible per-dialect using the ``engine_config_types`` accessor.
+
"""
options = dict((key[len(prefix):], configuration[key])
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 9330a602c..9a7b80bfd 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -61,14 +61,13 @@ class DefaultDialect(interfaces.Dialect):
engine_config_types = util.immutabledict([
('convert_unicode', util.bool_or_str('force')),
- ('pool_timeout', int),
+ ('pool_timeout', util.asint),
('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),
+ ('pool_recycle', util.asint),
+ ('pool_size', util.asint),
+ ('max_overflow', util.asint),
+ ('pool_threadlocal', util.asbool),
])
# if the NUMERIC type