Skip to content

Commit 1fc5506

Browse files
committed
Fix test cases
1 parent 9358fb4 commit 1fc5506

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

tests/test_generators.py

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
MetaData,
2020
Table,
2121
UniqueConstraint,
22-
conv,
2322
)
23+
from sqlalchemy.sql.elements import conv
2424
from sqlalchemy.sql.expression import text
2525
from sqlalchemy.sql.sqltypes import NullType
2626
from sqlalchemy.types import INTEGER, NUMERIC, SMALLINT, VARCHAR, Text
@@ -2284,16 +2284,18 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
22842284
generator.generate(),
22852285
"""\
22862286
from sqlalchemy import CheckConstraint, Column, ForeignKey, \
2287-
Integer, String, UniqueConstraint
2287+
Integer, String, UniqueConstraint, MetaData
22882288
from sqlalchemy.orm import declarative_base, relationship
22892289
2290-
metadata = MetaData.naming_convention = {
2291-
"uq": "UNIQUE_%(table_name)s_%(column_0_N_name)s",
2292-
"ck": "CHECK_%(table_name)s",
2293-
"fk": "FOREIGN_%(table_name)s_%(column_0_key)s_\
2290+
metadata = MetaData(
2291+
naming_convention={
2292+
"uq": "UNIQUE_%(table_name)s_%(column_0_N_name)s",
2293+
"ck": "CHECK_%(table_name)s",
2294+
"fk": "FOREIGN_%(table_name)s_%(column_0_key)s_\
22942295
%(referred_table_name)s_%(referred_column_0_label)s",
2295-
"pk": "PRIMARY_%(table_name)s_%(column_0N_name)s",
2296-
}
2296+
"pk": "PRIMARY_%(table_name)s_%(column_0N_name)s",
2297+
}
2298+
)
22972299
22982300
Base = declarative_base(metadata=metadata)
22992301
@@ -2341,13 +2343,16 @@ def test_constraint_name_token(self, generator: CodeGenerator) -> None:
23412343
validate_code(
23422344
generator.generate(),
23432345
"""\
2344-
from sqlalchemy import CheckConstraint, Column, Integer
2346+
from sqlalchemy import CheckConstraint, Column, Integer, MetaData
23452347
from sqlalchemy.orm import declarative_base
2348+
from sqlalchemy.sql.elements import conv
23462349
2347-
metadata = MetaData.naming_convention = {
2348-
"ck": "ck_%(table_name)s_%(constraint_name)s",
2349-
"pk": "pk_%(table_name)s",
2350-
}
2350+
metadata = MetaData(
2351+
naming_convention={
2352+
"ck": "ck_%(table_name)s_%(constraint_name)s",
2353+
"pk": "pk_%(table_name)s",
2354+
}
2355+
)
23512356
23522357
Base = declarative_base(metadata=metadata)
23532358

0 commit comments

Comments
 (0)