From: Martijn Pieters <mjpieters@fb.com>
Date: Wed, 22 Nov 2017 10:05:44 +0000 (+0000)
Subject: Allow for the database to produce a UUID instance
X-Git-Tag: rel_1_1_16~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0018127e47c4a056ea0b18db696130703391766d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Allow for the database to produce a UUID instance

Some database adapters (specifically, pg8000) already produce a uuid.UUID()
instance for UUID columns. Account for this.

(cherry picked from commit e80a5adfd406e2392cfaad687e8b3f0ae9ed4e11)
---

diff --git a/doc/build/core/custom_types.rst b/doc/build/core/custom_types.rst
index 64f91b23fc..e85601f172 100644
--- a/doc/build/core/custom_types.rst
+++ b/doc/build/core/custom_types.rst
@@ -163,7 +163,9 @@ binary in CHAR(16) if desired::
             if value is None:
                 return value
             else:
-                return uuid.UUID(value)
+                if not isinstance(value, uuid.UUID):
+                    value = uuid.UUID(value)
+                return value
 
 Marshal JSON Strings
 ^^^^^^^^^^^^^^^^^^^^