diff options
author | Jason Kirtland <jek@discorporate.us> | 2007-04-19 23:44:26 +0000 |
---|---|---|
committer | Jason Kirtland <jek@discorporate.us> | 2007-04-19 23:44:26 +0000 |
commit | 0fe6b80c7024e6f9430071f162274fbbd0e3ca44 (patch) | |
tree | b1da6761a496585cbcd68819d3104e0b1df012c3 /lib/sqlalchemy/databases/sqlite.py | |
parent | 42df71d2159e60042d0931b9dd6b878ecfac9dd4 (diff) | |
download | sqlalchemy-0fe6b80c7024e6f9430071f162274fbbd0e3ca44.tar.gz |
- Promoted mysql's dburl query string helper to util + fixed
- Coercing sqlite connect args provided in query string to their expected type
(e.g. 'timeout' as float, fixes #544)
- Coerce mysql's client_flag to int too
Diffstat (limited to 'lib/sqlalchemy/databases/sqlite.py')
-rw-r--r-- | lib/sqlalchemy/databases/sqlite.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index 0222496f8..6c1234542 100644 --- a/lib/sqlalchemy/databases/sqlite.py +++ b/lib/sqlalchemy/databases/sqlite.py @@ -10,6 +10,7 @@ import sys, StringIO, string, types, re from sqlalchemy import sql, engine, schema, ansisql, exceptions, pool, PassiveDefault import sqlalchemy.engine.default as default import sqlalchemy.types as sqltypes +import sqlalchemy.util as util import datetime,time @@ -179,7 +180,15 @@ class SQLiteDialect(ansisql.ANSIDialect): def create_connect_args(self, url): filename = url.database or ':memory:' - return ([filename], url.query) + + opts = url.query.copy() + util.coerce_kw_type(opts, 'timeout', float) + util.coerce_kw_type(opts, 'isolation_level', str) + util.coerce_kw_type(opts, 'detect_types', int) + util.coerce_kw_type(opts, 'check_same_thread', bool) + util.coerce_kw_type(opts, 'cached_statements', int) + + return ([filename], opts) def type_descriptor(self, typeobj): return sqltypes.adapt_type(typeobj, colspecs) |