Skip to content

Commit c452759

Browse files
committed
Use table type to find views
1 parent cfd2a77 commit c452759

3 files changed

Lines changed: 15 additions & 20 deletions

File tree

schemacrawler-lint/src/main/java/schemacrawler/tools/linter/LinterProviderForeignKeyMismatch.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
package schemacrawler.tools.linter;
1010

1111
import static java.util.Objects.requireNonNull;
12-
import static schemacrawler.utility.MetaDataUtility.isView;
1312

1413
import java.io.Serial;
1514
import java.sql.Connection;
@@ -64,7 +63,7 @@ protected void lint(final Table table, final Connection connections) {
6463

6564
private List<ForeignKey> findMismatchedForeignKeys(final Table table) {
6665
final List<ForeignKey> mismatchedForeignKeys = new ArrayList<>();
67-
if (table != null && !isView(table)) {
66+
if (table != null && !table.getTableType().isView()) {
6867
for (final ForeignKey foreignKey : table.getImportedForeignKeys()) {
6968
for (final ColumnReference columnReference : foreignKey) {
7069
final Column pkColumn = columnReference.getPrimaryKeyColumn();

schemacrawler-lint/src/main/java/schemacrawler/tools/linter/LinterProviderTableAllNullableColumns.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import static java.util.Objects.requireNonNull;
1212
import static schemacrawler.ermodel.utility.ERModelUtility.inferBridgeTable;
13-
import static schemacrawler.utility.MetaDataUtility.isView;
1413

1514
import java.io.Serial;
1615
import java.sql.Connection;
@@ -54,7 +53,7 @@ public String getSummary() {
5453
protected void lint(final Table table, final Connection connection) {
5554
requireNonNull(table, "No table provided");
5655

57-
if (isView(table) || inferBridgeTable(table) == OptionalBoolean.true_value) {
56+
if (table.getTableType().isView() || inferBridgeTable(table) == OptionalBoolean.true_value) {
5857
return;
5958
}
6059

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import static schemacrawler.tools.command.text.schema.options.HideDependantDatabaseObjectsType.hideTableConstraints;
3434
import static schemacrawler.tools.command.text.schema.options.HideDependantDatabaseObjectsType.hideTriggers;
3535
import static schemacrawler.utility.MetaDataUtility.getTypeName;
36-
import static schemacrawler.utility.MetaDataUtility.isView;
3736
import static us.fatehi.utility.Utility.isBlank;
3837
import static us.fatehi.utility.Utility.trimToEmpty;
3938

@@ -1221,23 +1220,21 @@ private void printTriggers(final Collection<Trigger> triggers) {
12211220
}
12221221

12231222
private void printViewTableUsage(final Table table) {
1224-
if (table == null || !isView(table)) {
1225-
return;
1226-
}
1227-
final View view = (View) table;
1228-
final Collection<Table> tableUsage = view.getTableUsage();
1229-
if (tableUsage.isEmpty()) {
1230-
return;
1231-
}
1223+
if (table instanceof final View view) {
1224+
final Collection<Table> tableUsage = view.getTableUsage();
1225+
if (tableUsage.isEmpty()) {
1226+
return;
1227+
}
12321228

1233-
formattingHelper.writeEmptyRow();
1234-
formattingHelper.writeWideRow("Table Usage", "section");
1229+
formattingHelper.writeEmptyRow();
1230+
formattingHelper.writeWideRow("Table Usage", "section");
12351231

1236-
formattingHelper.writeEmptyRow();
1237-
for (final Table usedTable : tableUsage) {
1238-
final String tableName = quoteName(usedTable);
1239-
final String tableType = "[" + usedTable.getTableType() + "]";
1240-
formattingHelper.writeNameRow(tableName, tableType);
1232+
formattingHelper.writeEmptyRow();
1233+
for (final Table usedTable : tableUsage) {
1234+
final String tableName = quoteName(usedTable);
1235+
final String tableType = "[" + usedTable.getTableType() + "]";
1236+
formattingHelper.writeNameRow(tableName, tableType);
1237+
}
12411238
}
12421239
}
12431240
}

0 commit comments

Comments
 (0)