|
19 | 19 | MetaData, |
20 | 20 | Table, |
21 | 21 | UniqueConstraint, |
22 | | - conv, |
23 | 22 | ) |
| 23 | +from sqlalchemy.sql.elements import conv |
24 | 24 | from sqlalchemy.sql.expression import text |
25 | 25 | from sqlalchemy.sql.sqltypes import NullType |
26 | 26 | from sqlalchemy.types import INTEGER, NUMERIC, SMALLINT, VARCHAR, Text |
@@ -2284,16 +2284,18 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None: |
2284 | 2284 | generator.generate(), |
2285 | 2285 | """\ |
2286 | 2286 | from sqlalchemy import CheckConstraint, Column, ForeignKey, \ |
2287 | | -Integer, String, UniqueConstraint |
| 2287 | +Integer, String, UniqueConstraint, MetaData |
2288 | 2288 | from sqlalchemy.orm import declarative_base, relationship |
2289 | 2289 |
|
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_\ |
2294 | 2295 | %(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 | + ) |
2297 | 2299 |
|
2298 | 2300 | Base = declarative_base(metadata=metadata) |
2299 | 2301 |
|
@@ -2341,13 +2343,16 @@ def test_constraint_name_token(self, generator: CodeGenerator) -> None: |
2341 | 2343 | validate_code( |
2342 | 2344 | generator.generate(), |
2343 | 2345 | """\ |
2344 | | - from sqlalchemy import CheckConstraint, Column, Integer |
| 2346 | + from sqlalchemy import CheckConstraint, Column, Integer, MetaData |
2345 | 2347 | from sqlalchemy.orm import declarative_base |
| 2348 | + from sqlalchemy.sql.elements import conv |
2346 | 2349 |
|
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 | + ) |
2351 | 2356 |
|
2352 | 2357 | Base = declarative_base(metadata=metadata) |
2353 | 2358 |
|
|
0 commit comments