Accept libpq schemes ('postgres://' and 'postgresql://') in addition to pq://

jwp · jwp · commit 924e5480556f · 2020-12-09T16:17:22.000-07:00
diff --git a/postgresql/iri.py b/postgresql/iri.py
@@ -14,7 +14,7 @@
 
 Driver Parameters:
 
-	pq://user@host/?[driver_param]=value&[other_param]=value?setting=val
+	pq://user@host/?[driver_param]=value&[other_param]=value?server_setting=val
 """
 from .resolved import riparse as ri
 from .string import split_ident
@@ -30,8 +30,8 @@ def structure(d, fieldproc = ri.unescape):
 	"""
 	Create a clientparams dictionary from a parsed RI.
 	"""
-	if d.get('scheme', 'pq').lower() != 'pq':
-		raise ValueError("PQ-IRI scheme is not 'pq'")
+	if d.get('scheme', 'pq').lower() not in {'pq', 'postgres', 'postgresql'}:
+		raise ValueError("PQ-IRI scheme is not 'pq', 'postgres', or 'postgresql'")
 	cpd = {
 		k : fieldproc(v) for k, v in d.items()
 		if k not in ('path', 'fragment', 'query', 'host', 'scheme')
diff --git a/postgresql/test/test_iri.py b/postgresql/test/test_iri.py
@@ -18,6 +18,7 @@
 	':pass@',
 	'u:p@h',
 	'u:p@h:1',
+	'postgres://host/database',
 	'pq://user:password@host:port/database?setting=value#public,private',
 	'pq://fæm.com:123/õéf/á?param=val',
 	'pq://l»»@fæm.com:123/õéf/á?param=val',
@@ -84,6 +85,20 @@
 ]
 
 class test_iri(unittest.TestCase):
+	def testAlternateSchemes(self):
+		field = pg_iri.parse("postgres://host")['host']
+		self.assertEqual(field, 'host')
+
+		field = pg_iri.parse("postgresql://host")['host']
+		self.assertEqual(field, 'host')
+
+		try:
+			pg_iri.parse("reject://host")
+		except ValueError:
+			pass
+		else:
+			self.fail("unacceptable IRI scheme not rejected")
+
 	def testIP6Hosts(self):
 		"""
 		Validate that IPv6 hosts are properly extracted.
@@ -101,15 +116,19 @@ def testIP6Hosts(self):
 			self.assertEqual(p['host'], h)
 
 	def testPresentPasswordObscure(self):
-		"password is present in IRI, and obscure it"
+		"""
+		Password is present in IRI, and obscure it.
+		"""
 		s = 'pq://user:pass@host:port/dbname'
 		o = 'pq://user:***@host:port/dbname'
 		p = pg_iri.parse(s)
 		ps = pg_iri.serialize(p, obscure_password = True)
 		self.assertEqual(ps, o)
 
 	def testPresentPasswordObscure(self):
-		"password is *not* present in IRI, and do nothing"
+		"""
+		Password is *not* present in IRI, and do nothing.
+		"""
 		s = 'pq://user@host:port/dbname'
 		o = 'pq://user@host:port/dbname'
 		p = pg_iri.parse(s)
