pg.ddx.io psycopg/psycopg GitHub issues and pull requests
help / color / mirror / Atom feedFrom: dvarrazzo (@dvarrazzo) <noreply+dvarrazzo@github.com>
To: psycopg/psycopg <noreply+psycopg-psycopg@github.com>
Subject: [psycopg/psycopg] PR #1272: refactor(c): drop class replacement hack to make UUID writable
Date: Sun, 01 Mar 2026 16:45:22 +0000
Message-ID: <gh-psycopg-psycopg-1272@github.com> (raw)
From a suggestion by @akx Aarni Koskela, see
https://github.com/psycopg/psycopg/pull/1269#discussion_r2869270196
inline patch 1: psycopg_c/psycopg_c/types/uuid.pyx (+77/-3 lines) download inline-1.patch
diff --git a/psycopg_c/psycopg_c/types/uuid.pyx b/psycopg_c/psycopg_c/types/uuid.pyx
index 164be69c3..ef243d82f 100644
--- a/psycopg_c/psycopg_c/types/uuid.pyx
+++ b/psycopg_c/psycopg_c/types/uuid.pyx
@@ -8,7 +8,7 @@ static const int8_t hex_to_int_map[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0-15
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 16-31
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 32-47
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, // 48-63 ('0'-'9')
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, // 48-63 ('0'-'9')
-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 64-79 ('A'-'F')
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 80-95
-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 96-111 ('a'-'f')
@@ -28,6 +28,80 @@ static const int8_t hex_to_int_map[] = {
cdef class _UUIDLoader(CLoader):
+ cdef object _object_new
+ cdef object _object_setattr
+ cdef PyObject *_uuid_type
+ cdef PyObject *_safeuuid_unknown
+
+ def __cinit__(self, oid: int, context: AdaptContext | None = None):
+ import uuid
+
+ self._object_new = object.__new__
+ self._object_setattr = object.__setattr__
+ self._uuid_type = <PyObject *>uuid.UUID
+ self._safeuuid_unknown = <PyObject *>uuid.SafeUUID.unknown
+
+ cdef object _return_uuid(self, uint64_t low, uint64_t high):
+ cdef object py_low = PyLong_FromUnsignedLongLong(low)
+ cdef object py_high = PyLong_FromUnsignedLongLong(high)
+ cdef object py_value = (py_high << 64) | py_low
+
+ cdef object u = PyObject_CallFunctionObjArgs(
+ self._object_new, self._uuid_type, NULL)
+ PyObject_CallFunctionObjArgs(
+ self._object_setattr,
+ <PyObject *>u, <PyObject *>"int", <PyObject *>py_value, NULL)
+ PyObject_CallFunctionObjArgs(
+ self._object_setattr,
+ <PyObject *>u, <PyObject *>"is_safe", self._safeuuid_unknown, NULL)
+ return u
+
+
+@cython.final
+cdef class UUIDLoader(_UUIDLoader):
+ format = PQ_TEXT
+
+ cdef object cload(self, const char *data, size_t length):
+ cdef uint64_t high = 0
+ cdef uint64_t low = 0
+ cdef size_t i
+ cdef int ndigits = 0
+ cdef int8_t c
+
+ for i in range(length):
+ c = data[i]
+ if hex_to_int_map[c] == -1:
+ continue
+
+ if ndigits < 16:
+ high = (high << 4) | hex_to_int_map[c]
+ else:
+ low = (low << 4) | hex_to_int_map[c]
+ ndigits += 1
+
+ if ndigits != 32:
+ raise ValueError("Invalid UUID string")
+
+ return self._return_uuid(low, high)
+
+
+@cython.final
+cdef class UUIDBinaryLoader(_UUIDLoader):
+ format = PQ_BINARY
+
+ cdef object cload(self, const char *data, size_t length):
+ cdef uint64_t be[2]
+ if length != sizeof(be):
+ raise ValueError("Invalid UUID data")
+ memcpy(&be, data, sizeof(be))
+
+ cdef uint64_t high = endian.be64toh(be[0])
+ cdef uint64_t low = endian.be64toh(be[1])
+ return self._return_uuid(low, high)
+
+
+cdef class _UUIDLoaderOld(CLoader):
+
cdef object _object_new
cdef object _uuid_type
cdef PyObject *_wuuid_type
@@ -55,7 +129,7 @@ cdef class _UUIDLoader(CLoader):
@cython.final
-cdef class UUIDLoader(_UUIDLoader):
+cdef class UUIDLoaderOld(_UUIDLoaderOld):
format = PQ_TEXT
cdef object cload(self, const char *data, size_t length):
@@ -83,7 +157,7 @@ cdef class UUIDLoader(_UUIDLoader):
@cython.final
-cdef class UUIDBinaryLoader(_UUIDLoader):
+cdef class UUIDBinaryLoaderOld(_UUIDLoaderOld):
format = PQ_BINARY
cdef object cload(self, const char *data, size_t length):
view thread (5+ messages) latest in thread
Message-ID: <gh-psycopg-psycopg-1272@github.com>
Permalink: ../gh-psycopg-psycopg-1272@github.com/
· ·
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox