|
21 | 21 | from typing import Any |
22 | 22 |
|
23 | 23 | import pytest |
24 | | -from sqlalchemy.orm import declarative_base, Mapped, mapped_column |
25 | | -from sqlalchemy import Column, Integer, String |
| 24 | +from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column |
| 25 | +from sqlalchemy import Column, Integer, String, Boolean, DateTime |
26 | 26 |
|
27 | 27 | from tests.integration.container.utils.rds_test_utility import RdsTestUtility |
28 | 28 | from ..utils.conditions import (disable_on_features, enable_on_deployments, |
@@ -52,18 +52,20 @@ def rds_utils(self): |
52 | 52 | @pytest.fixture(scope='class') |
53 | 53 | def sqlalchemy_models(self, sqlalchemy_setup): |
54 | 54 | """Create SQLAlchemy models after SQLAlchemy is set up""" |
| 55 | + #Base = declarative_base() |
55 | 56 |
|
56 | | - Base = declarative_base() |
| 57 | + class Base(DeclarativeBase): |
| 58 | + pass |
57 | 59 |
|
58 | | - class TestModel(Base): |
59 | | - """Basic test model for SQLAlchemy ORM functionality""" |
60 | | - __tablename__ = 'sqlalchemy_test_model' |
| 60 | + class TestModel(Base): |
| 61 | + """Basic test model for SQLAlchemy ORM functionality""" |
| 62 | + __tablename__ = 'sqlalchemy_test_model' |
61 | 63 |
|
62 | | - name: Mapped[str] = mapped_column(String(100)) |
63 | | - email: Mapped[str] = mapped_column(String, primary_key=True) |
64 | | - age: Mapped[int] = mapped_column(Integer) |
65 | | - is_active: Mapped[bool] = mapped_column(Bool, server_default=True) |
66 | | - created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now(), onupdate=func.now()) |
| 64 | + name: Mapped[str] = mapped_column(String(100)) |
| 65 | + email: Mapped[str] = mapped_column(String, primary_key=True) |
| 66 | + age: Mapped[int] = mapped_column(Integer) |
| 67 | + is_active: Mapped[bool] = mapped_column(Boolean) |
| 68 | + created_at: Mapped[datetime] = mapped_column(DateTime) |
67 | 69 |
|
68 | 70 | ''' |
69 | 71 | class DataTypeModel(models.Model): |
|
0 commit comments