Driver parameter support.

James William Pye · James William Pye · commit ef6072eb4c6f · 2009-03-21T01:12:54.000-07:00
diff --git a/postgresql/iri.py b/postgresql/iri.py
@@ -15,10 +15,11 @@
 
 Driver Parameters:
 
-	pq://user@host/?[driver_param]=value&[other_param]=value
+	pq://user@host/?[driver_param]=value&[other_param]=value?setting=val
 """
 from .resolved import riparse as ri
 from . import string as pg_str
+import operator
 import re
 
 escape_path_re = re.compile('[%s]' %(re.escape(ri.unescaped + ','),))
@@ -134,6 +135,15 @@ def construct(x, obscure_password = False):
 	password = x.get('password')
 	if obscure_password and password is not None:
 		password = '***'
+	driver_params = list({
+		'[' + k + ']' : str(v) for k,v in x.items()
+		if k not in (
+			'user', 'password', 'port', 'database', 'ssl',
+			'path', 'host', 'unix', 'ipv','settings'
+		)
+	}.items())
+	driver_params.sort(key=operator.itemgetter(0))
+
 	return (
 		'pqs' if x.get('ssl', False) is True else 'pq',
 		# netloc: user:pass@host[:port]
@@ -148,7 +158,9 @@ def construct(x, obscure_password = False):
 			for path_comp in path
 		]),
 		None if no_path_settings is None else (
-			ri.construct_query(no_path_settings)
+			ri.construct_query(
+				driver_params + no_path_settings
+			)
 		),
 		None if search_path is None else construct_path(search_path),
 	)
diff --git a/postgresql/test/test_iri.py b/postgresql/test/test_iri.py
@@ -23,6 +23,7 @@
 	'pq://f&aelig;m.com:123/&otilde;&eacute;f/&aacute;?param=val',
 	'pq://l&raquo;&raquo;@f&aelig;m.com:123/&otilde;&eacute;f/&aacute;?param=val',
 	'pq://f&aelig;&#5041;&#5067;m.com/&otilde;&eacute;f/&aacute;?param=val',
+	'pq://f&aelig;&#5041;&#5067;m.com/&otilde;&eacute;f/&aacute;?param=val&[setting]=value',
 )
 
 sample_structured_parameters = [
@@ -68,6 +69,19 @@
 			'set2' : 'val2',
 		},
 	},
+	{
+		'user' : 'user',
+		'password' : 'secret',
+		'host' : '',
+		'port' : 'ssh',
+		'database' : 'database_name',
+		'settings' : {
+			'set1' : 'val1',
+			'set2' : 'val2',
+		},
+		'connect_timeout' : '10',
+		'sslmode' : 'prefer',
+	},
 ]
 
 class test_iri(unittest.TestCase):
