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

[jOOQ/jOOQ#8528] Support IF [NOT] EXISTS clause

Browse Source 
Currently the implementation is hard-coded to throw a
`DataAccessException`. In the future there will be a feature flag for
this.
This commit is contained in:
Knut Wannheden 2019-09-17 17:01:49 +02:00
parent e4e803beea
commit 596cfd6ad6
4 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
View File

@ -262,6 +262,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements
}
final Table<?> $table() { return table; }
final boolean $ifExists() { return ifExists; }
final Field<?> $addColumn() { return addColumn; }
final DataType<?> $addColumnType() { return addColumnType; }

1
jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
View File

@ -187,6 +187,7 @@ final class CreateTableImpl extends AbstractRowCountQuery implements
final List<Field<?>> $columnFields() { return columnFields; }
final List<DataType<?>> $columnTypes() { return columnTypes; }
final List<Constraint> $constraints() { return constraints; }
final boolean $ifNotExists() { return ifNotExists; }
// ------------------------------------------------------------------------
// XXX: DSL API

34
jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java
View File

@ -60,14 +60,16 @@ import org.jooq.Table;
import org.jooq.TableField;
import org.jooq.UniqueKey;
import org.jooq.exception.DataAccessException;
import org.jooq.tools.JooqLogger;
final class DDLInterpreter {
private final Map<Name, MutableCatalog> catalogs = new LinkedHashMap<>();
private final Map<Name, MutableCatalog> catalogs = new LinkedHashMap<>();
private final Configuration configuration;
private final MutableCatalog defaultCatalog;
private final MutableSchema defaultSchema;
private MutableSchema currentSchema;
private JooqLogger log = JooqLogger.getLogger(DDLInterpreter.class);
DDLInterpreter(Configuration configuration) {
this.configuration = configuration;
@ -103,7 +105,14 @@ final class DDLInterpreter {
Table<?> table = query.$table();
MutableSchema schema = getSchema(table.getSchema(), true);
// TODO ifNotExists
if (schema.getTable(table.getUnqualifiedName()) != null) {
String message = "Table already exists: " + table.getQualifiedName();
if (!query.$ifNotExists())
throw new DataAccessException(message);
log.debug(message);
return;
}
MutableTable t = new MutableTable(table.getUnqualifiedName(), schema);
List<Field<?>> columns = query.$columnFields();
if (!columns.isEmpty())
@ -129,9 +138,17 @@ final class DDLInterpreter {
Table<?> table = query.$table();
MutableSchema schema = getSchema(table.getSchema(), false);
MutableTable existing = schema.getTable(table.getUnqualifiedName());
if (existing == null) {
String message = "Table does not exist: " + table.getQualifiedName();
if (!query.$ifExists())
throw new DataAccessException(message);
log.debug(message);
return;
}
Field<?> addColumn = query.$addColumn();
if (addColumn != null) {
MutableTable existing = schema.getTable(table.getUnqualifiedName());
existing.addColumn(addColumn.getUnqualifiedName(), query.$addColumnType());
}
}
@ -141,8 +158,14 @@ final class DDLInterpreter {
MutableSchema schema = getSchema(table.getSchema(), false);
// TODO schema == null
MutableTable oldTable = schema.dropTable(table.getUnqualifiedName());
// TODO oldTable == null
MutableTable existing = schema.dropTable(table.getUnqualifiedName());
if (existing == null) {
String message = "Table does not exist: " + table.getQualifiedName();
if (!query.$ifExists())
throw new DataAccessException(message);
log.debug(message);
return;
}
}
private final MutableSchema getSchema(Schema input, boolean create) {
@ -231,6 +254,7 @@ final class DDLInterpreter {
}
MutableTable getTable(Name name) {
name = normalize(name);
for (MutableTable table : tables)
if (table.getUnqualifiedName().equals(name))
return table;

1
jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
View File

@ -98,6 +98,7 @@ final class DropTableImpl extends AbstractRowCountQuery implements
}
final Table<?> $table() { return table; }
final boolean $ifExists() { return ifExists; }
// ------------------------------------------------------------------------
// XXX: DSL API