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

[jOOQ/jOOQ#8528] Interpret SetSchema

Browse Source
This commit is contained in:
Lukas Eder 2019-12-18 11:36:31 +01:00
parent 09080a6caf
commit ec1768245b
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,7 @@ final class DDLInterpreter {
private final Map<Name, MutableCatalog> catalogs = new LinkedHashMap<>();
private final MutableCatalog defaultCatalog;
private final MutableSchema defaultSchema;
private MutableSchema currentSchema;
// Caches
private final Map<Name, MutableCatalog.InterpretedCatalog> interpretedCatalogs = new HashMap<>();
@ -197,6 +198,12 @@ final class DDLInterpreter {
else if (query instanceof CommentOnImpl)
accept0((CommentOnImpl) query);
// TODO: Add support for catalogs
// else if (query instanceof SetCatalog)
// accept0((SetCatalog) query);
else if (query instanceof SetSchema)
accept0((SetSchema) query);
// The interpreter cannot handle DML statements. We're ignoring these for now.
else if (query instanceof Select)
;
@ -936,6 +943,14 @@ final class DDLInterpreter {
throw unsupportedQuery(query);
}
private final void accept0(SetSchema query) {
MutableSchema schema = getSchema(query.$schema());
if (schema == null)
throw schemaNotExists(query.$schema());
currentSchema = schema;
}
// -------------------------------------------------------------------------
// Exceptions
// -------------------------------------------------------------------------
@ -1059,7 +1074,7 @@ final class DDLInterpreter {
private final MutableSchema getSchema(Schema input, boolean create) {
if (input == null)
return getInterpreterSearchPathSchema(create);
return currentSchema(create);
MutableCatalog catalog = defaultCatalog;
if (input.getCatalog() != null) {
@ -1079,6 +1094,13 @@ final class DDLInterpreter {
return schema;
}
private final MutableSchema currentSchema(boolean create) {
if (currentSchema == null)
currentSchema = getInterpreterSearchPathSchema(create);
return currentSchema;
}
private final MutableSchema getInterpreterSearchPathSchema(boolean create) {
List<InterpreterSearchSchema> searchPath = configuration.settings().getInterpreterSearchPath();

2
jOOQ/src/main/java/org/jooq/impl/SetSchema.java
View File

@ -64,6 +64,8 @@ final class SetSchema extends AbstractRowCountQuery {
this.schema = schema;
}
final Schema $schema() { return schema; }
@Override
public final void accept(Context<?> ctx) {
switch (ctx.family()) {