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

[jOOQ/jOOQ#9768] Support MySQL inline INDEX specifications in DDLDatabase

Browse Source
This commit is contained in:
Lukas Eder 2022-02-08 10:57:03 +01:00
parent d5c55edf62
commit 16ca895637
3 changed files with 134 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
jOOQ/src/main/java/org/jooq/Replacers.java
View File

@ -78,83 +78,6 @@ package org.jooq;

42
jOOQ/src/main/java/org/jooq/impl/DDL.java
View File

@ -103,7 +103,7 @@ final class DDL {
this.configuration = configuration;
}
private final List<Query> createTableOrView(Table<?> table, Collection<? extends Constraint> constraints) {
final List<Query> createTableOrView(Table<?> table, Collection<? extends Constraint> constraints) {
boolean temporary = table.getType() == TableType.TEMPORARY;
boolean view = table.getType().isView();
OnCommit onCommit = table.getOptions().onCommit();
@ -225,34 +225,36 @@ final class DDL {
return createTableOrView(table, constraints(table));
}
private final List<Query> createIndex(Table<?> table) {
final List<Query> createIndex(Table<?> table) {
List<Query> result = new ArrayList<>();
if (configuration.flags().contains(DDLFlag.INDEX))
for (Index i : sortIf(table.getIndexes(), !configuration.respectIndexOrder()))
result.add(
(configuration.createIndexIfNotExists()
? i.getUnique()
? ctx.createUniqueIndexIfNotExists(i)
: ctx.createIndexIfNotExists(i)
: i.getUnique()
? ctx.createUniqueIndex(i)
: ctx.createIndex(i))
.on(i.getTable(), i.getFields())
);
result.add(createIndex(i));
return result;
}
private final List<Query> alterTableAddConstraints(Table<?> table) {
final Query createIndex(Index i) {
return (configuration.createIndexIfNotExists()
? i.getUnique()
? ctx.createUniqueIndexIfNotExists(i)
: ctx.createIndexIfNotExists(i)
: i.getUnique()
? ctx.createUniqueIndex(i)
: ctx.createIndex(i))
.on(i.getTable(), i.getFields());
}
final List<Query> alterTableAddConstraints(Table<?> table) {
return alterTableAddConstraints(table, constraints(table));
}
private final List<Query> alterTableAddConstraints(Table<?> table, List<Constraint> constraints) {
final List<Query> alterTableAddConstraints(Table<?> table, List<Constraint> constraints) {
return map(constraints, c -> ctx.alterTable(table).add(c));
}
private final List<Constraint> constraints(Table<?> table) {
final List<Constraint> constraints(Table<?> table) {
List<Constraint> result = new ArrayList<>();
result.addAll(primaryKeys(table));
@ -263,7 +265,7 @@ final class DDL {
return result;
}
private final List<Constraint> primaryKeys(Table<?> table) {
final List<Constraint> primaryKeys(Table<?> table) {
List<Constraint> result = new ArrayList<>();
if (configuration.flags().contains(PRIMARY_KEY) && (table.getType() != VIEW || configuration.includeConstraintsOnViews()))
@ -274,7 +276,7 @@ final class DDL {
return result;
}
private final List<Constraint> uniqueKeys(Table<?> table) {
final List<Constraint> uniqueKeys(Table<?> table) {
List<Constraint> result = new ArrayList<>();
if (configuration.flags().contains(UNIQUE) && (table.getType() != VIEW || configuration.includeConstraintsOnViews()))
@ -285,7 +287,7 @@ final class DDL {
return result;
}
private final List<Constraint> foreignKeys(Table<?> table) {
final List<Constraint> foreignKeys(Table<?> table) {
List<Constraint> result = new ArrayList<>();
if (configuration.flags().contains(FOREIGN_KEY) && (table.getType() != VIEW || configuration.includeConstraintsOnViews()))
@ -295,7 +297,7 @@ final class DDL {
return result;
}
private final List<Constraint> checks(Table<?> table) {
final List<Constraint> checks(Table<?> table) {
List<Constraint> result = new ArrayList<>();
if (configuration.flags().contains(CHECK) && (table.getType() != VIEW || configuration.includeConstraintsOnViews()))
@ -321,7 +323,7 @@ final class DDL {
return ctx.queries(queries);
}
private final List<Query> commentOn(Table<?> table) {
final List<Query> commentOn(Table<?> table) {
List<Query> result = new ArrayList<>();
if (configuration.flags().contains(COMMENT)) {

121
jOOQ/src/main/java/org/jooq/impl/Internal.java
View File

@ -38,17 +38,21 @@
package org.jooq.impl;
import static org.jooq.impl.Tools.CTX;
import static org.jooq.impl.Tools.configuration;
import static org.jooq.impl.Tools.nullSafe;
import static org.jooq.tools.StringUtils.isBlank;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Supplier;
import org.jooq.Attachable;
import org.jooq.Binding;
import org.jooq.Check;
import org.jooq.Configuration;
import org.jooq.Comment;
import org.jooq.Converter;
import org.jooq.DDLExportConfiguration;
import org.jooq.DataType;
import org.jooq.Domain;
import org.jooq.EmbeddableRecord;
@ -61,18 +65,25 @@ import org.jooq.OrderField;
import org.jooq.ParamMode;
import org.jooq.Parameter;
// ...
import org.jooq.Queries;
import org.jooq.Query;
import org.jooq.Record;
// ...
// ...
import org.jooq.Result;
import org.jooq.Row;
import org.jooq.Schema;
import org.jooq.Sequence;
import org.jooq.Statement;
import org.jooq.Support;
import org.jooq.Table;
import org.jooq.TableElement;
import org.jooq.TableField;
import org.jooq.UDT;
import org.jooq.UDTRecord;
import org.jooq.UniqueKey;
import org.jooq.exception.DataAccessException;
import org.jooq.impl.QOM.CreateTable;
// ...
// ...
@ -497,11 +508,103 @@ public final class Internal {
CTX.configuration().requireCommercial(logMessage);
}
/**
* Retrieve a {@link Configuration} from an attachable, or the default
* {@link Configuration} if the attachable is detached.
*/
public static final Configuration configuration(Attachable attachable) {
return Tools.configuration(attachable);
}
}