Add patch for psycopg2-2.9.10

msimacek · msimacek · commit 3fce96f2d48c · 2025-04-04T10:56:07.000+02:00
diff --git a/graalpython/lib-graalpython/patches/metadata.toml b/graalpython/lib-graalpython/patches/metadata.toml
@@ -394,11 +394,23 @@ patch = 'protobuf-3.21.9.patch'
 license = 'BSD-3-Clause'
 
 [[psycopg2.rules]]
-patch = "psycopg2.patch"
+version = '<= 2.9.9'
+patch = "psycopg2-2.9.9.patch"
+license = "LGPL-3.0-or-later WITH openssl-exception"
+
+[[psycopg2.rules]]
+version = '>= 2.9.10'
+patch = "psycopg2-2.9.10.patch"
+license = "LGPL-3.0-or-later WITH openssl-exception"
+
+[[psycopg2-binary.rules]]
+version = '<= 2.9.9'
+patch = "psycopg2-2.9.9.patch"
 license = "LGPL-3.0-or-later WITH openssl-exception"
 
 [[psycopg2-binary.rules]]
-patch = "psycopg2-binary.patch"
+version = '>= 2.9.10'
+patch = "psycopg2-2.9.10.patch"
 license = "LGPL-3.0-or-later WITH openssl-exception"
 
 [[py4j.rules]]
diff --git a/graalpython/lib-graalpython/patches/psycopg2-2.9.10.patch b/graalpython/lib-graalpython/patches/psycopg2-2.9.10.patch
@@ -1,15 +1,15 @@
 diff --git a/psycopg/utils.c b/psycopg/utils.c
-index 16be906..c78a24b 100644
+index 1dfb87d..28cc6c1 100644
 --- a/psycopg/utils.c
 +++ b/psycopg/utils.c
 @@ -392,7 +392,9 @@ psyco_set_error(PyObject *exc, cursorObject *curs, const char *msg)
  static int
  psyco_is_main_interp(void)
  {
--#if PY_VERSION_HEX >= 0x03080000
+-#if PY_VERSION_HEX >= 0x030d0000
 +#if GRAALVM_PYTHON
 +    return 1;
-+#elif PY_VERSION_HEX >= 0x03080000
-     /* tested with Python 3.8.0a2 */
-     return _PyInterpreterState_Get() == PyInterpreterState_Main();
- #else
++#elif PY_VERSION_HEX >= 0x030d0000
+     /* tested with Python 3.13.0a6 */
+     return PyInterpreterState_Get() == PyInterpreterState_Main();
+ #elif PY_VERSION_HEX >= 0x03080000
diff --git a/graalpython/lib-graalpython/patches/psycopg2-2.9.9.patch b/graalpython/lib-graalpython/patches/psycopg2-2.9.9.patch
