github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#10588] Deprecate <syntheticPrimaryKeys/>

Browse Source
This commit is contained in:
Lukas Eder 2020-09-04 10:08:36 +02:00
parent d5365531c9
commit 19ce35ce7b
2 changed files with 79 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
View File

@ -162,7 +162,6 @@ public abstract class AbstractDatabase implements Database {
private boolean forceIntegerTypesOnZeroScaleDecimals = true;
private String[] recordVersionFields;
private String[] recordTimestampFields;
private String[] syntheticPrimaryKeys;
private String[] syntheticIdentities;
private boolean embeddablePrimaryKeys = false;
private boolean embeddableUniqueKeys = false;
@ -1197,15 +1196,18 @@ public abstract class AbstractDatabase implements Database {
@Override
public void setSyntheticPrimaryKeys(String[] syntheticPrimaryKeys) {
this.syntheticPrimaryKeys = syntheticPrimaryKeys;
if (syntheticPrimaryKeys != null) {
for (String syntheticPrimaryKey : syntheticPrimaryKeys) {
log.warn("DEPRECATION", "The <syntheticPrimaryKeys/> configuration element has been deprecated in jOOQ 3.14. Use <syntheticKeys/> only, instead.");
getConfiguredSyntheticPrimaryKeys().add(new SyntheticPrimaryKeyType().withKeyFields(syntheticPrimaryKey));
}
}
}
@Override
public String[] getSyntheticPrimaryKeys() {
if (syntheticPrimaryKeys == null)
syntheticPrimaryKeys = new String[0];
return syntheticPrimaryKeys;
log.warn("DEPRECATION", "The <syntheticPrimaryKeys/> configuration element has been deprecated in jOOQ 3.14. Use <syntheticKeys/> only, instead.");
return new String[0];
}
@Override
@ -2679,13 +2681,6 @@ public abstract class AbstractDatabase implements Database {
}
if (getIncludePrimaryKeys()) {
onError(ERROR, "Error while generating synthetic primary keys", new ExceptionRunnable() {
@Override
public void run() throws Exception {
syntheticPrimaryKeysLegacy(result);
}
});
onError(ERROR, "Error while generating synthetic primary keys", new ExceptionRunnable() {
@Override
public void run() throws Exception {
@ -2857,24 +2852,6 @@ public abstract class AbstractDatabase implements Database {
return new ArrayList<>(unusedSyntheticForeignKeys);
}
private final void syntheticPrimaryKeys(DefaultRelations r) {
keyLoop:
for (SyntheticPrimaryKeyType key : getConfiguredSyntheticPrimaryKeys()) {
if (key.getKey() != null)
continue keyLoop;
for (TableDefinition table : filterExcludeInclude(getTables(), null, key.getKeyTables() != null ? key.getKeyTables() : ".*", Collections.emptyList())) {
String keyName = key.getName() != null ? key.getName() : "SYNTHETIC_PK_" + table.getName();
for (ColumnDefinition column : filterExcludeInclude(table.getColumns(), null, key.getKeyFields(), Collections.emptyList())) {
markUsed(key);
r.addPrimaryKey(keyName, table, column);
}
}
}
}
private final void overridePrimaryKeys(DefaultRelations r) {
keyLoop:
@ -2892,75 +2869,85 @@ public abstract class AbstractDatabase implements Database {
}
}
private final void syntheticPrimaryKeys(DefaultRelations r) {
keyLoop:
for (SyntheticPrimaryKeyType key : getConfiguredSyntheticPrimaryKeys()) {
if (key.getKey() != null)
continue keyLoop;
for (TableDefinition table : filterExcludeInclude(getTables(), null, key.getKeyTables() != null ? key.getKeyTables() : ".*", Collections.emptyList())) {
String keyName = key.getName() != null ? key.getName() : "SYNTHETIC_PK_" + table.getName();
List<ColumnDefinition> columns = filterExcludeInclude(table.getColumns(), null, key.getKeyFields(), Collections.emptyList());
if (!columns.isEmpty()) {
markUsed(key);
private final void syntheticPrimaryKeysLegacy(DefaultRelations r) {
List<UniqueKeyDefinition> syntheticKeys = new ArrayList<>();
for (TableDefinition table : getTables()) {
List<ColumnDefinition> columns = filterExcludeInclude(table.getColumns(), null, getSyntheticPrimaryKeys(), filters);
if (!columns.isEmpty()) {
DefaultUniqueKeyDefinition syntheticKey = new DefaultUniqueKeyDefinition(table.getSchema(), "SYNTHETIC_PK_" + table.getName(), table, true);
syntheticKey.getKeyColumns().addAll(columns);
syntheticKeys.add(syntheticKey);
DefaultUniqueKeyDefinition pk = new DefaultUniqueKeyDefinition(table.getSchema(), keyName, table, true);
pk.getKeyColumns().addAll(columns);
log.info("Synthetic primary key", "" + pk);
r.overridePrimaryKey(pk);
}
}
}
log.info("Synthetic primary keys", fetchedSize(syntheticKeys, syntheticKeys));
for (UniqueKeyDefinition key : syntheticKeys)
r.overridePrimaryKey(key);
}
@Override
public void close() {}

4
jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java
View File

@ -66,10 +66,6 @@ public class DefaultRelations implements Relations {
private transient Map<ColumnDefinition, List<ForeignKeyDefinition>> foreignKeysByColumn;
private transient Map<TableDefinition, List<CheckConstraintDefinition>> checkConstraintsByTable;
public void promoteUniqueKey(UniqueKeyDefinition uk) {
}
public void addPrimaryKey(String keyName, TableDefinition table, ColumnDefinition column) {
addPrimaryKey(keyName, table, column, true);
}