Add missing adapter for UUIDs

Cito · Cito · commit 8a3e892c9320 · 2020-10-02T20:32:57.000+02:00
diff --git a/docs/contents/changelog.rst b/docs/contents/changelog.rst
@@ -1,8 +1,12 @@
 ChangeLog
 =========
 
-Version 5.2.1 (2020-09-25)
+Version 5.2.2 (to be released)
 ------------------------------
+- Added a missing adapter method for UUIDs in the classic `pg` module.
+
+Version 5.2.1 (2020-09-25)
+--------------------------
 - This version officially supports the new Python 3.9 and PostgreSQL 13.
 - The `copy_to()` and `copy_from()` methods in the pgdb module now also work
   with table names containing schema qualifiers (#47).
diff --git a/pg.py b/pg.py
@@ -487,6 +487,14 @@ def _adapt_hstore(self, v):
             return str(Hstore(v))
         raise TypeError('Hstore parameter %s has wrong type' % v)
 
+    def _adapt_uuid(self, v):
+        """Adapt a UUID parameter."""
+        if not v:
+            return None
+        if isinstance(v, basestring):
+            return v
+        return str(v)
+
     @classmethod
     def _adapt_text_array(cls, v):
         """Adapt a text type array parameter."""
diff --git a/tests/test_classic_dbwrapper.py b/tests/test_classic_dbwrapper.py
@@ -4400,6 +4400,21 @@ def testAdaptQueryTypedWithHstore(self):
             params[0] = ','.join(sorted(params[0].split(',')))
         self.assertEqual(params, ['one=>"it\'s fine\",two=>2'])
 
+    def testAdaptQueryTypedWithUuid(self):
+        format_query = self.adapter.format_query
+        value = '12345678-1234-5678-1234-567812345678'
+        sql, params = format_query("select %s", (value,), 'uuid')
+        self.assertEqual(sql, "select $1")
+        self.assertEqual(params, ['12345678-1234-5678-1234-567812345678'])
+        value = UUID('{12345678-1234-5678-1234-567812345678}')
+        sql, params = format_query("select %s", (value,), 'uuid')
+        self.assertEqual(sql, "select $1")
+        self.assertEqual(params, ['12345678-1234-5678-1234-567812345678'])
+        value = UUID('{12345678-1234-5678-1234-567812345678}')
+        sql, params = format_query("select %s", (value,))
+        self.assertEqual(sql, "select $1")
+        self.assertEqual(params, ['12345678-1234-5678-1234-567812345678'])
+
     def testAdaptQueryTypedDict(self):
         format_query = self.adapter.format_query
         self.assertRaises(
