Skip to content

Commit

Permalink
[#7826] Constraints referencing columns that are not generated should…
Browse files Browse the repository at this point in the history 
… not be generated either
  • Loading branch information
@lukaseder
lukaseder committed Aug 28, 2018
1 parent 76383fb commit 6d65485
Show file tree
Hide file tree
Showing 12 changed files with 284 additions and 218 deletions.
18 changes: 10 additions & 8 deletions jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
View file
Expand Up @@ -1727,25 +1727,27 @@ public PackageDefinition getPackage(SchemaDefinition schema, String inputName) {
} }


protected static final <D extends Definition> D getDefinition(List<D> definitions, String name, boolean ignoreCase) { protected static final <D extends Definition> D getDefinition(List<D> definitions, String name, boolean ignoreCase) {
for (D definition : definitions) { if (name == null)
return null;

for (D definition : definitions)
if ((ignoreCase && definition.getName().equalsIgnoreCase(name)) || if ((ignoreCase && definition.getName().equalsIgnoreCase(name)) ||
(!ignoreCase && definition.getName().equals(name))) { (!ignoreCase && definition.getName().equals(name)))


return definition; return definition;
}
}


return null; return null;
} }


protected static final <D extends Definition> D getDefinition(List<D> definitions, Name name, boolean ignoreCase) { protected static final <D extends Definition> D getDefinition(List<D> definitions, Name name, boolean ignoreCase) {
for (D definition : definitions) { if (name == null)
return null;

for (D definition : definitions)
if ((ignoreCase && definition.getQualifiedNamePart().equalsIgnoreCase(name)) || if ((ignoreCase && definition.getQualifiedNamePart().equalsIgnoreCase(name)) ||
(!ignoreCase && definition.getQualifiedNamePart().equals(name))) { (!ignoreCase && definition.getQualifiedNamePart().equals(name)))


return definition; return definition;
}
}


return null; return null;
} }
Expand Down
148 changes: 90 additions & 58 deletions jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java
View file
Expand Up @@ -39,6 +39,7 @@


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
Expand All @@ -53,48 +54,70 @@ public class DefaultRelations implements Relations {


private static final JooqLogger log = JooqLogger.getLogger(DefaultRelations.class); private static final JooqLogger log = JooqLogger.getLogger(DefaultRelations.class);


private Map<Key, UniqueKeyDefinition> primaryKeys = new LinkedHashMap<Key, UniqueKeyDefinition>(); private final Map<Key, UniqueKeyDefinition> primaryKeys = new LinkedHashMap<Key, UniqueKeyDefinition>();
private Map<Key, UniqueKeyDefinition> uniqueKeys = new LinkedHashMap<Key, UniqueKeyDefinition>(); private final Map<Key, UniqueKeyDefinition> uniqueKeys = new LinkedHashMap<Key, UniqueKeyDefinition>();
private Map<Key, ForeignKeyDefinition> foreignKeys = new LinkedHashMap<Key, ForeignKeyDefinition>(); private final Map<Key, ForeignKeyDefinition> foreignKeys = new LinkedHashMap<Key, ForeignKeyDefinition>();
private Map<Key, CheckConstraintDefinition> checkConstraints = new LinkedHashMap<Key, CheckConstraintDefinition>(); private final Map<Key, CheckConstraintDefinition> checkConstraints = new LinkedHashMap<Key, CheckConstraintDefinition>();
private final Set<Key> incompleteKeys = new HashSet<Key>();


private transient Map<ColumnDefinition, UniqueKeyDefinition> primaryKeysByColumn; private transient Map<ColumnDefinition, UniqueKeyDefinition> primaryKeysByColumn;
private transient Map<ColumnDefinition, List<UniqueKeyDefinition>> uniqueKeysByColumn; private transient Map<ColumnDefinition, List<UniqueKeyDefinition>> uniqueKeysByColumn;
private transient Map<ColumnDefinition, List<ForeignKeyDefinition>> foreignKeysByColumn; private transient Map<ColumnDefinition, List<ForeignKeyDefinition>> foreignKeysByColumn;
private transient Map<TableDefinition, List<CheckConstraintDefinition>> checkConstraintsByTable; private transient Map<TableDefinition, List<CheckConstraintDefinition>> checkConstraintsByTable;


public void addPrimaryKey(String keyName, ColumnDefinition column) { public void addPrimaryKey(String keyName, TableDefinition table, ColumnDefinition column) {
Key key = key(table, keyName);


// [#2718] Column exclusions may hit primary key references. Ignore // [#2718] Column exclusions may hit primary key references. Ignore
// such primary keys // such primary keys
if (column == null) { if (column == null) {
log.info("Ignoring primary key", keyName + "(column unavailable)"); log.info("Ignoring primary key", keyName + " (column unavailable)");

// [#7826] Prevent incomplete keys from being generated
if (table != null) {
incompleteKeys.add(key);
primaryKeys.remove(key);
uniqueKeys.remove(key);
}

return; return;
} }


if (log.isDebugEnabled()) { if (incompleteKeys.contains(key))
return;

if (log.isDebugEnabled())
log.debug("Adding primary key", keyName + " (" + column + ")"); log.debug("Adding primary key", keyName + " (" + column + ")");
}


UniqueKeyDefinition key = getUniqueKey(keyName, column, true); UniqueKeyDefinition result = getUniqueKey(keyName, table, column, true);
key.getKeyColumns().add(column); result.getKeyColumns().add(column);
} }


public void addUniqueKey(String keyName, ColumnDefinition column) { public void addUniqueKey(String keyName, TableDefinition table, ColumnDefinition column) {
Key key = key(table, keyName);


// [#2718] Column exclusions may hit unique key references. Ignore // [#2718] Column exclusions may hit unique key references. Ignore
// such unique keys // such unique keys
if (column == null) { if (column == null) {
log.info("Ignoring unique key", keyName + "(column unavailable)"); log.info("Ignoring unique key", keyName + " (column unavailable)");

// [#7826] Prevent incomplete keys from being generated
if (table != null) {
incompleteKeys.add(key);
uniqueKeys.remove(key);
}

return; return;
} }


if (log.isDebugEnabled()) { if (incompleteKeys.contains(key))
return;

if (log.isDebugEnabled())
log.debug("Adding unique key", keyName + " (" + column + ")"); log.debug("Adding unique key", keyName + " (" + column + ")");
}


UniqueKeyDefinition key = getUniqueKey(keyName, column, false); UniqueKeyDefinition result = getUniqueKey(keyName, table, column, false);
key.getKeyColumns().add(column); result.getKeyColumns().add(column);
} }


public void overridePrimaryKey(UniqueKeyDefinition key) { public void overridePrimaryKey(UniqueKeyDefinition key) {
Expand All @@ -118,68 +141,82 @@ public void overridePrimaryKey(UniqueKeyDefinition key) {


// Add the new primary key // Add the new primary key
Key mapKey = key(key.getTable(), key.getName()); Key mapKey = key(key.getTable(), key.getName());
if (incompleteKeys.contains(mapKey))
return;

primaryKeys.put(mapKey, key); primaryKeys.put(mapKey, key);
uniqueKeys.put(mapKey, key); uniqueKeys.put(mapKey, key);
log.info("Overriding primary key", "Table : " + key.getTable() + log.info("Overriding primary key", "Table : " + key.getTable() +
", previous key : " + ((old == null) ? "none" : old.getName()) + ", previous key : " + ((old == null) ? "none" : old.getName()) +
", new key : " + key.getName()); ", new key : " + key.getName());
} }


private UniqueKeyDefinition getUniqueKey(String keyName, ColumnDefinition column, boolean isPK) { private UniqueKeyDefinition getUniqueKey(String keyName, TableDefinition table, ColumnDefinition column, boolean isPK) {
UniqueKeyDefinition key = uniqueKeys.get(key(column, keyName)); Key key = key(table, keyName);
UniqueKeyDefinition result = uniqueKeys.get(key);


if (key == null) { if (result == null) {
key = new DefaultUniqueKeyDefinition(column.getSchema(), keyName, column.getContainer(), isPK); result = new DefaultUniqueKeyDefinition(column.getSchema(), keyName, table, isPK);
uniqueKeys.put(key(column, keyName), key); uniqueKeys.put(key, result);


if (isPK) { if (isPK)
primaryKeys.put(key(column, keyName), key); primaryKeys.put(key, result);
}
} }


return key; return result;
} }


public void addForeignKey( public void addForeignKey(
String foreignKeyName, String foreignKeyName,
String uniqueKeyName, TableDefinition foreignKeyTable,
ColumnDefinition foreignKeyColumn, ColumnDefinition foreignKeyColumn,
SchemaDefinition uniqueKeySchema) { String uniqueKeyName,
TableDefinition uniqueKeyTable) {




// [#2718] Column exclusions may hit foreign key references. Ignore // [#2718] Column exclusions may hit foreign key references. Ignore
// such foreign keys // such foreign keys
Key key = key(foreignKeyTable, foreignKeyName);
if (foreignKeyColumn == null) { if (foreignKeyColumn == null) {
log.info("Ignoring foreign key", foreignKeyColumn + "(column unavailable)"); log.info("Ignoring foreign key", foreignKeyColumn + " (column unavailable)");

// [#7826] Prevent incomplete keys from being generated
if (foreignKeyTable != null) {
incompleteKeys.add(key);
foreignKeys.remove(key);
}

return; return;
} }


if (incompleteKeys.contains(key))
return;

// [#1134] Prevent NPE's when a foreign key references a unique key // [#1134] Prevent NPE's when a foreign key references a unique key
// from another schema // from another schema
if (uniqueKeySchema == null) { if (uniqueKeyTable == null) {
log.info("Ignoring foreign key", foreignKeyName + " (" + foreignKeyColumn + ") referencing " + uniqueKeyName + " references a schema out of scope for jooq-meta: " + uniqueKeySchema); log.info("Ignoring foreign key", foreignKeyName + " (" + foreignKeyColumn + ") referencing " + uniqueKeyName + " references a schema out of scope for jooq-meta: " + uniqueKeyTable);
return; return;
} }


log.info("Adding foreign key", foreignKeyName + " (" + foreignKeyColumn + ") referencing " + uniqueKeyName); log.info("Adding foreign key", foreignKeyName + " (" + foreignKeyColumn + ") referencing " + uniqueKeyName);


ForeignKeyDefinition foreignKey = foreignKeys.get(key(foreignKeyColumn, foreignKeyName)); ForeignKeyDefinition foreignKey = foreignKeys.get(key);


if (foreignKey == null) { if (foreignKey == null) {
UniqueKeyDefinition uniqueKey = uniqueKeys.get(key(uniqueKeySchema, uniqueKeyName)); UniqueKeyDefinition uniqueKey = uniqueKeys.get(key(uniqueKeyTable, uniqueKeyName));


// If the unique key is not loaded, ignore this foreign key // If the unique key is not loaded, ignore this foreign key
if (uniqueKey != null) { if (uniqueKey != null) {
foreignKey = new DefaultForeignKeyDefinition(foreignKeyColumn.getSchema(), foreignKeyName, foreignKeyColumn.getContainer(), uniqueKey); foreignKey = new DefaultForeignKeyDefinition(foreignKeyColumn.getSchema(), foreignKeyName, foreignKeyColumn.getContainer(), uniqueKey);
foreignKeys.put(key(foreignKeyColumn, foreignKeyName), foreignKey); foreignKeys.put(key, foreignKey);


uniqueKey.getForeignKeys().add(foreignKey); uniqueKey.getForeignKeys().add(foreignKey);
} }
} }


if (foreignKey != null) { if (foreignKey != null)
foreignKey.getKeyColumns().add(foreignKeyColumn); foreignKey.getKeyColumns().add(foreignKeyColumn);
}
} }


public void addCheckConstraint(TableDefinition table, CheckConstraintDefinition constraint) { public void addCheckConstraint(TableDefinition table, CheckConstraintDefinition constraint) {
Expand All @@ -191,11 +228,9 @@ public UniqueKeyDefinition getPrimaryKey(ColumnDefinition column) {
if (primaryKeysByColumn == null) { if (primaryKeysByColumn == null) {
primaryKeysByColumn = new LinkedHashMap<ColumnDefinition, UniqueKeyDefinition>(); primaryKeysByColumn = new LinkedHashMap<ColumnDefinition, UniqueKeyDefinition>();


for (UniqueKeyDefinition primaryKey : primaryKeys.values()) { for (UniqueKeyDefinition primaryKey : primaryKeys.values())
for (ColumnDefinition keyColumn : primaryKey.getKeyColumns()) { for (ColumnDefinition keyColumn : primaryKey.getKeyColumns())
primaryKeysByColumn.put(keyColumn, primaryKey); primaryKeysByColumn.put(keyColumn, primaryKey);
}
}
} }


return primaryKeysByColumn.get(column); return primaryKeysByColumn.get(column);
Expand Down Expand Up @@ -228,9 +263,8 @@ public List<UniqueKeyDefinition> getUniqueKeys(ColumnDefinition column) {
public List<UniqueKeyDefinition> getUniqueKeys(TableDefinition table) { public List<UniqueKeyDefinition> getUniqueKeys(TableDefinition table) {
Set<UniqueKeyDefinition> result = new LinkedHashSet<UniqueKeyDefinition>(); Set<UniqueKeyDefinition> result = new LinkedHashSet<UniqueKeyDefinition>();


for (ColumnDefinition column : table.getColumns()) { for (ColumnDefinition column : table.getColumns())
result.addAll(getUniqueKeys(column)); result.addAll(getUniqueKeys(column));
}


return new ArrayList<UniqueKeyDefinition>(result); return new ArrayList<UniqueKeyDefinition>(result);
} }
Expand All @@ -239,9 +273,8 @@ public List<UniqueKeyDefinition> getUniqueKeys(TableDefinition table) {
public List<UniqueKeyDefinition> getUniqueKeys(SchemaDefinition schema) { public List<UniqueKeyDefinition> getUniqueKeys(SchemaDefinition schema) {
Set<UniqueKeyDefinition> result = new LinkedHashSet<UniqueKeyDefinition>(); Set<UniqueKeyDefinition> result = new LinkedHashSet<UniqueKeyDefinition>();


for (TableDefinition table : schema.getDatabase().getTables(schema)) { for (TableDefinition table : schema.getDatabase().getTables(schema))
result.addAll(getUniqueKeys(table)); result.addAll(getUniqueKeys(table));
}


return new ArrayList<UniqueKeyDefinition>(result); return new ArrayList<UniqueKeyDefinition>(result);
} }
Expand Down Expand Up @@ -279,9 +312,8 @@ public List<ForeignKeyDefinition> getForeignKeys(ColumnDefinition column) {
public List<ForeignKeyDefinition> getForeignKeys(TableDefinition table) { public List<ForeignKeyDefinition> getForeignKeys(TableDefinition table) {
Set<ForeignKeyDefinition> result = new LinkedHashSet<ForeignKeyDefinition>(); Set<ForeignKeyDefinition> result = new LinkedHashSet<ForeignKeyDefinition>();


for (ColumnDefinition column : table.getColumns()) { for (ColumnDefinition column : table.getColumns())
result.addAll(getForeignKeys(column)); result.addAll(getForeignKeys(column));
}


return new ArrayList<ForeignKeyDefinition>(result); return new ArrayList<ForeignKeyDefinition>(result);
} }
Expand All @@ -307,33 +339,33 @@ public List<CheckConstraintDefinition> getCheckConstraints(TableDefinition table
return list != null ? list : Collections.<CheckConstraintDefinition>emptyList(); return list != null ? list : Collections.<CheckConstraintDefinition>emptyList();
} }


private static Key key(Definition definition, String keyName) { private static Key key(TableDefinition definition, String keyName) {
return new Key(definition.getSchema(), keyName); return new Key(definition, keyName);
} }


/** /**
* A simple local wrapper for a key definition (schema + key name) * A simple local wrapper for a key definition (table + key name)
*/ */
private static class Key { private static class Key {
final SchemaDefinition schema; final TableDefinition table;
final String keyName; final String keyName;


Key(SchemaDefinition schema, String keyName) { Key(TableDefinition table, String keyName) {
this.schema = schema; this.table = table;
this.keyName = keyName; this.keyName = keyName;
} }


@Override @Override
public String toString() { public String toString() {
return "Key [schema=" + schema + ", keyName=" + keyName + "]"; return "Key [table=" + table + ", keyName=" + keyName + "]";
} }


@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;
int result = 1; int result = 1;
result = prime * result + ((keyName == null) ? 0 : keyName.hashCode()); result = prime * result + ((keyName == null) ? 0 : keyName.hashCode());
result = prime * result + ((schema == null) ? 0 : schema.hashCode()); result = prime * result + ((table == null) ? 0 : table.hashCode());
return result; return result;
} }


Expand All @@ -352,11 +384,11 @@ public boolean equals(Object obj) {
} }
else if (!keyName.equals(other.keyName)) else if (!keyName.equals(other.keyName))
return false; return false;
if (schema == null) { if (table == null) {
if (other.schema != null) if (other.table != null)
return false; return false;
} }
else if (!schema.equals(other.schema)) else if (!table.equals(other.table))
return false; return false;
return true; return true;
} }
Expand Down
29 changes: 17 additions & 12 deletions jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDDatabase.java
View file
Expand Up @@ -93,9 +93,8 @@ protected void loadPrimaryKeys(DefaultRelations relations) throws SQLException {
String columnName = record.get(DB_INDEX_KEY.KEY_ATTR_NAME); String columnName = record.get(DB_INDEX_KEY.KEY_ATTR_NAME);


TableDefinition table = getTable(getSchemata().get(0), tableName); TableDefinition table = getTable(getSchemata().get(0), tableName);
if (table != null) { if (table != null)
relations.addUniqueKey(key, table.getColumn(columnName)); relations.addUniqueKey(key, table, table.getColumn(columnName));
}
} }
} }


Expand All @@ -107,9 +106,8 @@ protected void loadUniqueKeys(DefaultRelations relations) throws SQLException {
String columnName = record.get(DB_INDEX_KEY.KEY_ATTR_NAME); String columnName = record.get(DB_INDEX_KEY.KEY_ATTR_NAME);


TableDefinition table = getTable(getSchemata().get(0), tableName); TableDefinition table = getTable(getSchemata().get(0), tableName);
if (table != null) { if (table != null)
relations.addPrimaryKey(key, table.getColumn(columnName)); relations.addPrimaryKey(key, table, table.getColumn(columnName));
}
} }
} }


Expand Down Expand Up @@ -154,12 +152,19 @@ public void run(Connection connection) throws SQLException {
record.get("PKTABLE_NAME", String.class) + record.get("PKTABLE_NAME", String.class) +
"__" + "__" +
record.get("PK_NAME", String.class); record.get("PK_NAME", String.class);

String uniqueKeyTableName = record.get("PKTABLE_NAME", String.class);
TableDefinition referencingTable = getTable(getSchemata().get(0), foreignKeyTableName);
if (referencingTable != null) { TableDefinition foreignKeyTable = getTable(getSchemata().get(0), foreignKeyTableName);
ColumnDefinition column = referencingTable.getColumn(foreignKeyColumnName); TableDefinition uniqueKeyTable = getTable(getSchemata().get(0), uniqueKeyTableName);
relations.addForeignKey(foreignKeyName, uniqueKeyName, column, getSchemata().get(0));
} if (foreignKeyTable != null && uniqueKeyTable != null)
relations.addForeignKey(
foreignKeyName,
foreignKeyTable,
foreignKeyTable.getColumn(foreignKeyColumnName),
uniqueKeyName,
uniqueKeyTable
);
} }
} }
} }
Expand Down

0 comments on commit 6d65485

Please sign in to comment.