Skip to content

Commit a4367fc

Browse files
authored
Use ERModel functionality (#2248)
* Rename cardinality class * Update changelog
1 parent 39a902e commit a4367fc

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

schemacrawler-diagram/src/main/java/schemacrawler/tools/text/formatter/diagram/SchemaDotFormatter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import java.util.Collection;
3131
import java.util.Collections;
3232
import java.util.List;
33-
import schemacrawler.ermodel.model.ForeignKeyCardinality;
33+
import schemacrawler.ermodel.model.RelationshipCardinality;
3434
import schemacrawler.ermodel.utility.EntityModelUtility;
3535
import schemacrawler.schema.Column;
3636
import schemacrawler.schema.ColumnDataType;
@@ -252,7 +252,7 @@ public void handleTablesStart() {
252252
// No output required
253253
}
254254

255-
private String arrowheadFk(final ForeignKeyCardinality connectivity) {
255+
private String arrowheadFk(final RelationshipCardinality connectivity) {
256256
if (!options.isShowForeignKeyCardinality()) {
257257
return "none";
258258
}
@@ -368,7 +368,7 @@ private String printColumnReference(
368368
final boolean isForeignKey,
369369
final String fkName,
370370
final ColumnReference columnRef,
371-
final ForeignKeyCardinality fkCardinality,
371+
final RelationshipCardinality fkCardinality,
372372
final boolean isPkColumnFiltered,
373373
final boolean isFkColumnFiltered,
374374
final boolean showRemarks,
@@ -428,7 +428,7 @@ private <R extends ColumnReference> void printForeignKeys(
428428
}
429429
for (final TableReference foreignKey : foreignKeys) {
430430
final boolean isForeignKey = foreignKey.getType() == foreign_key;
431-
final ForeignKeyCardinality fkCardinality = EntityModelUtility.inferCardinality(foreignKey);
431+
final RelationshipCardinality fkCardinality = EntityModelUtility.inferCardinality(foreignKey);
432432
boolean showRemarks = !options.isHideRemarks() && foreignKey.hasRemarks();
433433
for (final ColumnReference columnRef : foreignKey) {
434434
final Table referencedTable = columnRef.getPrimaryKeyColumn().getParent();

schemacrawler-text/src/main/java/schemacrawler/tools/text/formatter/schema/SchemaTextFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import java.util.Objects;
4949
import java.util.logging.Level;
5050
import java.util.logging.Logger;
51-
import schemacrawler.ermodel.model.ForeignKeyCardinality;
51+
import schemacrawler.ermodel.model.RelationshipCardinality;
5252
import schemacrawler.ermodel.utility.EntityModelUtility;
5353
import schemacrawler.schema.ActionOrientationType;
5454
import schemacrawler.schema.Column;
@@ -606,7 +606,7 @@ private void printColumnDataType(final ColumnDataType columnDataType) {
606606

607607
private void printColumnReferences(
608608
final boolean isForeignKey, final Table table, final TableReference foreignKey) {
609-
final ForeignKeyCardinality fkCardinality = EntityModelUtility.inferCardinality(foreignKey);
609+
final RelationshipCardinality fkCardinality = EntityModelUtility.inferCardinality(foreignKey);
610610
for (final ColumnReference columnRef : foreignKey) {
611611

612612
final Column pkColumn = columnRef.getPrimaryKeyColumn();

schemacrawler-website/src/site/markdown/changes-report.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
SchemaCrawler release notes.
44

55
<a name="v17.5.0"></a>
6-
## Release 17.5.0 - 2026-01-19
6+
## Release 17.5.0 - 2026-01-0
77
- Re-organize database connector options into a builder to avoid too many arguments
8-
- Allow for connection properties that are not published by the JDBC driver - fixes Core #40
8+
- Allow for connection properties that are not published by the JDBC driver - fixes #40
9+
- Complete first implementation of ERModel
10+
- Deprecate `Table::getWeakAssociations()` for removal
911

1012

1113
<a name="v17.4.0"></a>

0 commit comments

Comments
 (0)