Skip to content

Commit 12f6fe4

Browse files
committed
Fix test cases
1 parent 66de0fc commit 12f6fe4

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
@@ -2285,16 +2285,18 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
22852285
generator.generate(),
22862286
"""\
22872287
from sqlalchemy import CheckConstraint, Column, ForeignKey, \
2288-
Integer, String, UniqueConstraint
2288+
Integer, String, UniqueConstraint, MetaData
22892289
from sqlalchemy.orm import declarative_base, relationship
22902290
2291-
metadata = MetaData.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_\
2291+
metadata = MetaData(
2292+
naming_convention={
2293+
"uq": "UNIQUE_%(table_name)s_%(column_0_N_name)s",
2294+
"ck": "CHECK_%(table_name)s",
2295+
"fk": "FOREIGN_%(table_name)s_%(column_0_key)s_\
22952296
%(referred_table_name)s_%(referred_column_0_label)s",
2296-
"pk": "PRIMARY_%(table_name)s_%(column_0N_name)s",
2297-
}
2297+
"pk": "PRIMARY_%(table_name)s_%(column_0N_name)s",
2298+
}
2299+
)
22982300
22992301
Base = declarative_base(metadata=metadata)
23002302
@@ -2342,13 +2344,16 @@ def test_constraint_name_token(self, generator: CodeGenerator) -> None:
23422344
validate_code(
23432345
generator.generate(),
23442346
"""\
2345-
from sqlalchemy import CheckConstraint, Column, Integer
2347+
from sqlalchemy import CheckConstraint, Column, Integer, MetaData
23462348
from sqlalchemy.orm import declarative_base
2349+
from sqlalchemy.sql.elements import conv
23472350
2348-
metadata = MetaData.naming_convention = {
2349-
"ck": "ck_%(table_name)s_%(constraint_name)s",
2350-
"pk": "pk_%(table_name)s",
2351-
}
2351+
metadata = MetaData(
2352+
naming_convention={
2353+
"ck": "ck_%(table_name)s_%(constraint_name)s",
2354+
"pk": "pk_%(table_name)s",
2355+
}
2356+
)
23522357
23532358
Base = declarative_base(metadata=metadata)
23542359

0 commit comments

Comments
 (0)