Merge branch 'master' of github.com:kvesteri/sqlalchemy-utils

2015-07-16 09:57:50 +03:00
parent 9ab88a7ab5 a61908c2c4
commit 6ad148aae1
1 changed files with 4 additions and 0 deletions
--- a/sqlalchemy_utils/types/uuid.py
+++ b/sqlalchemy_utils/types/uuid.py
@@ -73,6 +73,10 @@ class UUIDType(types.TypeDecorator, ScalarCoercible):
            return value

        if self.native and dialect.name == 'postgresql':
+            if isinstance(value, uuid.UUID):
+                # Some drivers convert PostgreSQL's uuid values to
+                # Python's uuid.UUID objects by themselves
+                return value
            return uuid.UUID(value)

        return uuid.UUID(bytes=value) if self.binary else uuid.UUID(value)