Skip to content

Commit a94245d

Browse files
committed
Fix cardinality symbols
1 parent ca78f22 commit a94245d

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

schemacrawler-scripting/src/main/resources/scripts/plantuml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
pk_col_name = support.cleanName(columnReference.getPrimaryKeyColumn())
9191
fk_col_name = support.cleanName(columnReference.getForeignKeyColumn())
9292
cardinality = support.cardinalitySymbol(fk)
93-
print(f'{pk_schema_slug}.{pk_table_slug}::{pk_col_name} {cardinality} {fk_schema_slug}.{fk_table_slug}::{fk_col_name}', end='')
93+
print(f'{fk_schema_slug}.{fk_table_slug}::{fk_col_name} {cardinality} {pk_schema_slug}.{pk_table_slug}::{pk_col_name}', end='')
9494
if support.hasName(fk):
9595
print(f' : {fk.getName()}', end='')
9696
print()

schemacrawler-scripting/src/main/resources/templates/plantuml.vm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ end note
9595
#set($pkColName = $support.cleanName($columnReference.getPrimaryKeyColumn()))
9696
#set($fkColName = $support.cleanName($columnReference.getForeignKeyColumn()))
9797
#set($cardinality = $support.cardinalitySymbol($fk))
98-
$pkSchemaSlug.$pkTableSlug::$pkColName $cardinality $fkSchemaSlug.$fkTableSlug::$fkColName#if($support.hasName($fk)) : $fk.getName()#end
98+
$fkSchemaSlug.$fkTableSlug::$fkColName $cardinality $pkSchemaSlug.$pkTableSlug::$pkColName#if($support.hasName($fk)) : $fk.getName()#end
9999
#end
100100
#end
101101
#end

schemacrawler-scripting/src/test/resources/BuiltIn.mermaid.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ erDiagram
8080
}
8181

8282
"PUBLIC.BOOKS.AUTHORS" }o--o{ "PUBLIC.BOOKS.BOOKS" : "via bridge table BOOKAUTHORS"
83-
"PUBLIC.BOOKS.BOOKS" ||--o| "PUBLIC.BOOKS.BOOKS" : "self-reference"
84-
"PUBLIC.BOOKS.CUSTOMERDATA" ||--|{ "PUBLIC.BOOKS.CUSTOMERS" : "foreign key"
83+
"PUBLIC.BOOKS.BOOKS" |o--|| "PUBLIC.BOOKS.BOOKS" : "self-reference"
84+
"PUBLIC.BOOKS.CUSTOMERDATA" }|--|| "PUBLIC.BOOKS.CUSTOMERS" : "foreign key"
8585
"PUBLIC.BOOKS.Celebrity Updates" ||--|| "PUBLIC.BOOKS.Celebrities" : "foreign key"
86-
"PUBLIC.BOOKS.ΒΙΒΛΊΑ" ||--|{ "PUBLIC.BOOKS.PUBLISHERS" : "foreign key"
87-
"PUBLIC.PUBLISHER SALES.SALES" ||--o{ "PUBLIC.BOOKS.BOOKS" : "foreign key"
88-
"PUBLIC.PUBLISHER SALES.SALES" ||--|{ "PUBLIC.PUBLISHER SALES.REGIONS" : "foreign key"
89-
"PUBLIC.PUBLISHER SALES.SALES" ||--o{ "PUBLIC.PUBLISHER SALES.SALESDATA" : "foreign key"
86+
"PUBLIC.BOOKS.ΒΙΒΛΊΑ" }|--|| "PUBLIC.BOOKS.PUBLISHERS" : "foreign key"
87+
"PUBLIC.PUBLISHER SALES.SALES" }o--|| "PUBLIC.BOOKS.BOOKS" : "foreign key"
88+
"PUBLIC.PUBLISHER SALES.SALES" }|--|| "PUBLIC.PUBLISHER SALES.REGIONS" : "foreign key"
89+
"PUBLIC.PUBLISHER SALES.SALES" }o--|| "PUBLIC.PUBLISHER SALES.SALESDATA" : "foreign key"

schemacrawler-scripting/src/test/resources/BuiltIn.plantuml.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ entity "<b>$name</b>" as $slug << (V, Aquamarine) view >>
3131
title "FROM TEST: Database Schema Diagram"
3232

3333
legend bottom right
34-
generated by SchemaCrawler 17.10.1
35-
generated on 2026-04-21 02:01:18
34+
generated by SchemaCrawler 17.11.2
35+
generated on 2026-06-09 12:10:49
3636
end legend
3737

3838

@@ -222,16 +222,16 @@ $table("SALES", "sales_751e68cc") {
222222
}
223223

224224

225-
books_208b5502.authors_f521e766::ID ||--|{ books_208b5502.bookauthors_ead84c5d::AUTHORID : Z_FK_AUTHOR
226-
books_208b5502.books_f4a675c8::ID ||--o| books_208b5502.books_f4a675c8::PREVIOUSEDITIONID : FK_PREVIOUSEDITION
227-
books_208b5502.books_f4a675c8::ID ||--o{ publishersales_7f7f6c20.sales_751e68cc::BOOKID : FK_SALES_BOOK
228-
books_208b5502.books_f4a675c8::ID ||--|{ books_208b5502.bookauthors_ead84c5d::BOOKID
229-
books_208b5502.celebrities_db1258df::Id ||--|| books_208b5502.celebrityupdates_f5088e8b::Celebrity Id
230-
books_208b5502.customers_f705d773::ID ||--|{ books_208b5502.customerdata_b0af83c6::CUSTOMERID : FK_CUSTOMER
231-
books_208b5502.publishers_8037d535::ID ||--|{ books_208b5502.βιβλία_3cecb755::ΕΚΔΌΤΗΣ : FK_ΒΙΒΛΊΑ_PUBLISHERS
232-
publishersales_7f7f6c20.regions_dbf65bbf::POSTALCODE ||--|{ publishersales_7f7f6c20.sales_751e68cc::POSTALCODE : FK_SALES_REGIONS
233-
publishersales_7f7f6c20.regions_dbf65bbf::COUNTRY ||--|{ publishersales_7f7f6c20.sales_751e68cc::COUNTRY : FK_SALES_REGIONS
234-
publishersales_7f7f6c20.salesdata_1193fa76::SALESDATAID ||--o{ publishersales_7f7f6c20.sales_751e68cc::SALESDATAID : FK_SALES_SALESDATA
225+
books_208b5502.bookauthors_ead84c5d::AUTHORID }|--|| books_208b5502.authors_f521e766::ID : Z_FK_AUTHOR
226+
books_208b5502.books_f4a675c8::PREVIOUSEDITIONID |o--|| books_208b5502.books_f4a675c8::ID : FK_PREVIOUSEDITION
227+
publishersales_7f7f6c20.sales_751e68cc::BOOKID }o--|| books_208b5502.books_f4a675c8::ID : FK_SALES_BOOK
228+
books_208b5502.bookauthors_ead84c5d::BOOKID }|--|| books_208b5502.books_f4a675c8::ID
229+
books_208b5502.celebrityupdates_f5088e8b::Celebrity Id ||--|| books_208b5502.celebrities_db1258df::Id
230+
books_208b5502.customerdata_b0af83c6::CUSTOMERID }|--|| books_208b5502.customers_f705d773::ID : FK_CUSTOMER
231+
books_208b5502.βιβλία_3cecb755::ΕΚΔΌΤΗΣ }|--|| books_208b5502.publishers_8037d535::ID : FK_ΒΙΒΛΊΑ_PUBLISHERS
232+
publishersales_7f7f6c20.sales_751e68cc::POSTALCODE }|--|| publishersales_7f7f6c20.regions_dbf65bbf::POSTALCODE : FK_SALES_REGIONS
233+
publishersales_7f7f6c20.sales_751e68cc::COUNTRY }|--|| publishersales_7f7f6c20.regions_dbf65bbf::COUNTRY : FK_SALES_REGIONS
234+
publishersales_7f7f6c20.sales_751e68cc::SALESDATAID }o--|| publishersales_7f7f6c20.salesdata_1193fa76::SALESDATAID : FK_SALES_SALESDATA
235235

236236
@enduml
237237

0 commit comments

Comments
 (0)