Fix sql_type_from_oid to not to raise unnecessarily and return None on failure

elprans · elprans · commit ab8471e4eb25 · 2011-04-09T15:36:42.000-04:00
The real fix is, of course, to make sure that oid_to_name never fails
for valid oids.
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -207,7 +207,11 @@ def sql_type_from_oid(self, oid, qi = quote_ident):
 		if oid in self.typinfo:
 			nsp, name, *_ = self.typinfo[oid]
 			return qi(nsp) + '.' + qi(name)
-		return 'pg_catalog.' + pg_types.oid_to_name.get(oid)
+		name = pg_types.oid_to_name.get(oid)
+		if name:
+			return 'pg_catalog.%s' % name
+		else:
+			return None
 
 	def type_from_oid(self, oid):
 		if oid in self._cache:
