[ticket:256] propigating url.query arguments to connect() function for all db's

6 files changed, 20 insertions, 1 deletions

diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index 085d8cf44..bef185597 100644
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -123,6 +123,10 @@ class FireBirdDialect(ansisql.ANSIDialect):
         if opts.get('port'):
             opts['host'] = "%s/%s" % (opts['host'], opts['port'])
             del opts['port']
+        opts.update(url.query)
+        # pop arguments that we took at the module level
+        opts.pop('type_conv', None)
+        opts.pop('concurrency_level', None)
         self.opts = opts
         
         return ([], self.opts)
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 9d51d535d..6613009fc 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -241,6 +241,7 @@ class MSSQLDialect(ansisql.ANSIDialect):
 
     def create_connect_args(self, url):
         self.opts = url.translate_connect_args(['host', 'database', 'user', 'password', 'port'])
+        self.opts.update(url.query)
         return ([], self.opts)
 
     def connect_args(self):
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 3f3e8d148..c9ebd7ba6 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -265,6 +265,18 @@ class MySQLDialect(ansisql.ANSIDialect):
 
     def create_connect_args(self, url):
         opts = url.translate_connect_args(['host', 'db', 'user', 'passwd', 'port'])
+        opts.update(url.query)
+        def coercetype(param, type):
+            if param in opts and type(param) is not type:
+                if type is bool:
+                    opts[param] = bool(int(opts[param]))
+                else:
+                    opts[param] = type(opts[param])
+        coercetype('compress', bool)
+        coercetype('connect_timeout', int)
+        coercetype('use_unicode', bool)   # this could break SA Unicode type
+        coercetype('charset', str)        # this could break SA Unicode type
+        # TODO: what about options like "ssl", "cursorclass" and "conv" ?
         return [[], opts]
 
     def create_execution_context(self):
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index c279da619..897ed640e 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -141,6 +141,7 @@ class OracleDialect(ansisql.ANSIDialect):
             dsn = dsn,
             threaded = self.threaded
             )
+        opts.update(url.query)
         return ([], opts)
         
     def type_descriptor(self, typeobj):
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index decccba58..8368c8931 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -225,6 +225,7 @@ class PGDialect(ansisql.ANSIDialect):
                 opts['port'] = int(opts['port'])
             else:
                 opts['port'] = str(opts['port'])
+        opts.update(url.query)
         return ([], opts)
 
     def create_execution_context(self):
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index c703cd81e..c681f391a 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -141,7 +141,7 @@ class SQLiteDialect(ansisql.ANSIDialect):
         return SQLiteSchemaGenerator(*args, **kwargs)
     def create_connect_args(self, url):
         filename = url.database or ':memory:'
-        return ([filename], {})
+        return ([filename], url.query)
     def type_descriptor(self, typeobj):
         return sqltypes.adapt_type(typeobj, colspecs)
     def create_execution_context(self):