mirror of
https://github.com/psycopg/psycopg2.git
synced 2024-11-22 08:56:34 +03:00
Dropped custom array parsing for UUID[]
Use the C generic array parsing exposed by new_array_type().
This commit is contained in:
parent
f782470d71
commit
dca6cffd6e
|
@ -473,18 +473,9 @@ def register_uuid(oids=None, conn_or_curs=None):
|
||||||
oid1 = oids
|
oid1 = oids
|
||||||
oid2 = 2951
|
oid2 = 2951
|
||||||
|
|
||||||
def parseUUIDARRAY(data, cursor):
|
|
||||||
if data is None:
|
|
||||||
return None
|
|
||||||
elif data == '{}':
|
|
||||||
return []
|
|
||||||
else:
|
|
||||||
return [((len(x) > 0 and x != 'NULL') and uuid.UUID(x) or None)
|
|
||||||
for x in data[1:-1].split(',')]
|
|
||||||
|
|
||||||
_ext.UUID = _ext.new_type((oid1, ), "UUID",
|
_ext.UUID = _ext.new_type((oid1, ), "UUID",
|
||||||
lambda data, cursor: data and uuid.UUID(data) or None)
|
lambda data, cursor: data and uuid.UUID(data) or None)
|
||||||
_ext.UUIDARRAY = _ext.new_type((oid2,), "UUID[]", parseUUIDARRAY)
|
_ext.UUIDARRAY = _ext.new_array_type((oid2,), "UUID[]", _ext.UUID)
|
||||||
|
|
||||||
_ext.register_type(_ext.UUID, conn_or_curs)
|
_ext.register_type(_ext.UUID, conn_or_curs)
|
||||||
_ext.register_type(_ext.UUIDARRAY, conn_or_curs)
|
_ext.register_type(_ext.UUIDARRAY, conn_or_curs)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user