From f4a45381b0b7c27b848a4a966d0733094684d07d Mon Sep 17 00:00:00 2001 From: collerek Date: Wed, 30 Sep 2020 11:52:44 +0200 Subject: [PATCH] switch all together to char as postgres is failing --- .coverage | Bin 53248 -> 53248 bytes ormar/fields/sqlalchemy_uuid.py | 18 ++++-------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.coverage b/.coverage index 2d8a6bb12748c7e76270cd3f6e685c33be3acda8..de993f7e8cb46ecfd46c4f95839865ae0d37eff8 100644 GIT binary patch delta 137 zcmV;40CxX?paX!Q1F%9b1vN1`F*vhFFTYS$U;q#K59$xx577_B53>)N4~-9C4^j_G z4paX!Q1F%9b1u-@{G&HkEFTYS$UjPsJ59$xx577_B53>)N4~-9C4^a6KmvvtW;)Krh)VvH$=8 diff --git a/ormar/fields/sqlalchemy_uuid.py b/ormar/fields/sqlalchemy_uuid.py index fbf1388..1ad7e65 100644 --- a/ormar/fields/sqlalchemy_uuid.py +++ b/ormar/fields/sqlalchemy_uuid.py @@ -1,7 +1,6 @@ import uuid from typing import Any, Optional, Union -from sqlalchemy.dialects.postgresql import UUID as psqlUUID from sqlalchemy.engine.default import DefaultDialect from sqlalchemy.types import CHAR, TypeDecorator @@ -29,10 +28,7 @@ class UUID(TypeDecorator): # pragma nocover return ret_value def load_dialect_impl(self, dialect: DefaultDialect) -> Any: - if dialect.name == "postgresql": - return dialect.type_descriptor(psqlUUID()) - else: - return dialect.type_descriptor(CHAR(32)) + return dialect.type_descriptor(CHAR(32)) def process_bind_param( self, value: Union[str, int, bytes, uuid.UUID, None], dialect: DefaultDialect @@ -41,19 +37,13 @@ class UUID(TypeDecorator): # pragma nocover return value elif not isinstance(value, uuid.UUID): value = self._cast_to_uuid(value) - if dialect.name == "postgresql": - return str(value) - else: - return "%.32x" % value.int + return "%.32x" % value.int def process_result_value( self, value: Optional[str], dialect: DefaultDialect ) -> Optional[uuid.UUID]: if value is None: return value - if dialect.name == "postgresql": + if not isinstance(value, uuid.UUID): return uuid.UUID(value) - else: - if not isinstance(value, uuid.UUID): - return uuid.UUID(value) - return value + return value