diff options
Diffstat (limited to 'lib/sqlalchemy/engine/url.py')
| -rw-r--r-- | lib/sqlalchemy/engine/url.py | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py index 483d40703..1662efe20 100644 --- a/lib/sqlalchemy/engine/url.py +++ b/lib/sqlalchemy/engine/url.py @@ -83,7 +83,12 @@ class URL(object): if self.query: keys = list(self.query) keys.sort() - s += '?' + "&".join("%s=%s" % (k, self.query[k]) for k in keys) + s += '?' + "&".join( + "%s=%s" % ( + k, + element + ) for k in keys for element in util.to_list(self.query[k]) + ) return s def __str__(self): @@ -130,6 +135,7 @@ class URL(object): def _instantiate_plugins(self, kwargs): plugin_names = util.to_list(self.query.get('plugin', ())) + plugin_names += kwargs.get('plugins', []) return [ plugins.load(plugin_name)(self, kwargs) @@ -230,10 +236,20 @@ def _parse_rfc1738_args(name): if components['database'] is not None: tokens = components['database'].split('?', 2) components['database'] = tokens[0] - query = ( - len(tokens) > 1 and dict(util.parse_qsl(tokens[1]))) or None - if util.py2k and query is not None: - query = {k.encode('ascii'): query[k] for k in query} + + if len(tokens) > 1: + query = {} + + for key, value in util.parse_qsl(tokens[1]): + if util.py2k: + key = key.encode('ascii') + if key in query: + query[key] = util.to_list(query[key]) + query[key].append(value) + else: + query[key] = value + else: + query = None else: query = None components['query'] = query |