Skip to content

Commit eed7283

Browse files
test(sqlalchemy-spanner): add mockserver 15-matrix tests and sample for types.Uuid vs types.UUID
1 parent 4693696 commit eed7283

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

packages/sqlalchemy-spanner/samples/uuid_sample.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ class CustomerLegacy(Base):
5454
"""Uses types.Uuid() -> Compiles to STRING(36) by default."""
5555

5656
__tablename__ = "customers_legacy"
57-
id: Mapped[UUID] = mapped_column(
58-
types.Uuid(), primary_key=True, default=uuid.uuid4
59-
)
57+
id: Mapped[UUID] = mapped_column(types.Uuid(), primary_key=True, default=uuid.uuid4)
6058
name: Mapped[str] = mapped_column()
6159

6260

@@ -67,9 +65,7 @@ class CustomerNative(Base):
6765
"""
6866

6967
__tablename__ = "customers_native"
70-
id: Mapped[UUID] = mapped_column(
71-
types.UUID(), primary_key=True, default=uuid.uuid4
72-
)
68+
id: Mapped[UUID] = mapped_column(types.UUID(), primary_key=True, default=uuid.uuid4)
7369
name: Mapped[str] = mapped_column()
7470

7571

@@ -78,7 +74,9 @@ class CustomerExplicitString(Base):
7874

7975
__tablename__ = "customers_explicit_string"
8076
id: Mapped[UUID] = mapped_column(
81-
types.Uuid(native_uuid=False), primary_key=True, default=uuid.uuid4
77+
types.Uuid(native_uuid=False),
78+
primary_key=True,
79+
default=uuid.uuid4,
8280
)
8381
name: Mapped[str] = mapped_column()
8482

@@ -104,9 +102,7 @@ def run_with_flag_disabled():
104102

105103
with Session(engine) as session:
106104
cust_legacy = CustomerLegacy(name="Alice_Legacy_FlagDisabled")
107-
cust_override = CustomerExplicitString(
108-
name="Diana_String_FlagDisabled"
109-
)
105+
cust_override = CustomerExplicitString(name="Diana_String_FlagDisabled")
110106
session.add_all([cust_legacy, cust_override])
111107
session.commit()
112108

packages/sqlalchemy-spanner/tests/mockserver_tests/test_uuid.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414

1515
import uuid
16+
from uuid import UUID
1617

1718
from google.cloud.spanner_v1 import TypeCode
1819
from sqlalchemy import Column, MetaData, Table, select, types
@@ -37,18 +38,19 @@ class Base(DeclarativeBase):
3738

3839
class UserUuid(Base):
3940
__tablename__ = "users_uuid"
40-
id: Mapped[uuid.UUID] = mapped_column(types.Uuid(), primary_key=True)
41+
id: Mapped[UUID] = mapped_column(types.Uuid(), primary_key=True)
4142

4243

4344
class UserUUID(Base):
4445
__tablename__ = "users_UUID"
45-
id: Mapped[uuid.UUID] = mapped_column(types.UUID(), primary_key=True)
46+
id: Mapped[UUID] = mapped_column(types.UUID(), primary_key=True)
4647

4748

4849
class UserUuidNativeFalse(Base):
4950
__tablename__ = "users_uuid_native_false"
50-
id: Mapped[uuid.UUID] = mapped_column(
51-
types.Uuid(native_uuid=False), primary_key=True
51+
id: Mapped[UUID] = mapped_column(
52+
types.Uuid(native_uuid=False),
53+
primary_key=True,
5254
)
5355

5456

0 commit comments

Comments
 (0)