@@ -971,7 +971,8 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
971971 generator .metadata .naming_convention = {
972972 "uq" : "UNIQUE_%(table_name)s_%(column_0_N_name)s" ,
973973 "ck" : "CHECK_%(table_name)s" ,
974- "fk" : "FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s" ,
974+ "fk" : "FOREIGN_%(table_name)s_%(column_0_key)s_\
975+ %(referred_table_name)s_%(referred_column_0_name)s" ,
975976 "pk" : "PRIMARY_%(table_name)s_%(column_0N_name)s" ,
976977 }
977978
@@ -986,7 +987,7 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
986987 ForeignKeyConstraint (
987988 ["container_id" ],
988989 ["containers.id" ],
989- name = "FOREIGN_items_container_id_containers " ,
990+ name = "FOREIGN_items_container_id_containers_id " ,
990991 ),
991992 )
992993 Table (
@@ -1007,7 +1008,8 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
10071008
10081009metadata = MetaData()
10091010metadata.naming_convention = {'ck': 'CHECK_%(table_name)s',
1010- 'fk': 'FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s',
1011+ 'fk': 'FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s_\
1012+ %(referred_column_0_name)s',
10111013 'pk': 'PRIMARY_%(table_name)s_%(column_0N_name)s',
10121014 'uq': 'UNIQUE_%(table_name)s_%(column_0_N_name)s'}
10131015
@@ -2314,7 +2316,8 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
23142316 generator .metadata .naming_convention = {
23152317 "uq" : "UNIQUE_%(table_name)s_%(column_0_N_name)s" ,
23162318 "ck" : "CHECK_%(table_name)s" ,
2317- "fk" : "FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s" ,
2319+ "fk" : "FOREIGN_%(table_name)s_%(column_0_key)s_\
2320+ %(referred_table_name)s_%(referred_column_0_name)s" ,
23182321 "pk" : "PRIMARY_%(table_name)s_%(column_0N_name)s" ,
23192322 }
23202323
@@ -2329,7 +2332,7 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
23292332 ForeignKeyConstraint (
23302333 ["container_id" ],
23312334 ["containers.id" ],
2332- name = "FOREIGN_items_container_id_containers " ,
2335+ name = "FOREIGN_items_container_id_containers_id " ,
23332336 ),
23342337 )
23352338 Table (
@@ -2351,7 +2354,8 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
23512354
23522355Base = declarative_base()
23532356Base.metadata.naming_convention = {'ck': 'CHECK_%(table_name)s',
2354- 'fk': 'FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s',
2357+ 'fk': 'FOREIGN_%(table_name)s_%(column_0_key)s_\
2358+ %(referred_table_name)s_%(referred_column_0_name)s',
23552359 'pk': 'PRIMARY_%(table_name)s_%(column_0N_name)s',
23562360 'uq': 'UNIQUE_%(table_name)s_%(column_0_N_name)s'}
23572361
@@ -2727,7 +2731,8 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
27272731 generator .metadata .naming_convention = {
27282732 "uq" : "UNIQUE_%(table_name)s_%(column_0_N_name)s" ,
27292733 "ck" : "CHECK_%(table_name)s" ,
2730- "fk" : "FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s" ,
2734+ "fk" : "FOREIGN_%(table_name)s_%(column_0_key)s\
2735+ _%(referred_table_name)s_%(referred_column_0_name)s" ,
27312736 "pk" : "PRIMARY_%(table_name)s_%(column_0N_name)s" ,
27322737 }
27332738
@@ -2742,7 +2747,7 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
27422747 ForeignKeyConstraint (
27432748 ["container_id" ],
27442749 ["containers.id" ],
2745- name = "FOREIGN_items_container_id_containers " ,
2750+ name = "FOREIGN_items_container_id_containers_id " ,
27462751 ),
27472752 )
27482753 Table (
@@ -2769,7 +2774,8 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
27692774
27702775mapper_registry = registry()
27712776mapper_registry.metadata.naming_convention = {'ck': 'CHECK_%(table_name)s',
2772- 'fk': 'FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s',
2777+ 'fk': 'FOREIGN_%(table_name)s_%(column_0_key)s_\
2778+ %(referred_table_name)s_%(referred_column_0_name)s',
27732779 'pk': 'PRIMARY_%(table_name)s_%(column_0N_name)s',
27742780 'uq': 'UNIQUE_%(table_name)s_%(column_0_N_name)s'}
27752781
@@ -2972,7 +2978,8 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
29722978 generator .metadata .naming_convention = {
29732979 "uq" : "UNIQUE_%(table_name)s_%(column_0_N_name)s" ,
29742980 "ck" : "CHECK_%(table_name)s" ,
2975- "fk" : "FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s" ,
2981+ "fk" : "FOREIGN_%(table_name)s_%(column_0_key)s_\
2982+ %(referred_table_name)s_%(referred_column_0_name)s" ,
29762983 "pk" : "PRIMARY_%(table_name)s_%(column_0N_name)s" ,
29772984 }
29782985
@@ -2987,7 +2994,7 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
29872994 ForeignKeyConstraint (
29882995 ["container_id" ],
29892996 ["containers.id" ],
2990- name = "FOREIGN_items_container_id_containers " ,
2997+ name = "FOREIGN_items_container_id_containers_id " ,
29912998 ),
29922999 )
29933000 Table (
@@ -3010,7 +3017,8 @@ def test_constraints_with_default_names(self, generator: CodeGenerator) -> None:
30103017from sqlmodel import Field, Relationship, SQLModel
30113018
30123019SQLModel.metadata.naming_convention = {'ck': 'CHECK_%(table_name)s',
3013- 'fk': 'FOREIGN_%(table_name)s_%(column_0_key)s_%(referred_table_name)s',
3020+ 'fk': 'FOREIGN_%(table_name)s_%(column_0_key)s_\
3021+ %(referred_table_name)s_%(referred_column_0_name)s',
30143022 'pk': 'PRIMARY_%(table_name)s_%(column_0N_name)s',
30153023 'uq': 'UNIQUE_%(table_name)s_%(column_0_N_name)s'}
30163024
0 commit comments