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

[jOOQ/jOOQ#8910] Parse pg_catalog.set_config('search_path') as SET SCHEMA in DDLDatabase

Browse Source
This commit is contained in:
Lukas Eder 2019-07-08 12:13:43 +02:00
parent 314d6fc522
commit 57e1ac0c99
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/ddl/DDLDatabase.java
View File

@ -134,6 +134,9 @@ public class DDLDatabase extends H2Database {
// [#7771] [#8011] Ignore all parsed storage clauses when executing the statements
ctx.data("org.jooq.meta.extensions.ddl.ignore-storage-clauses", true);
// [#8910] Parse things a bit differently for use with the DDLDatabase
ctx.data("org.jooq.meta.extensions.ddl.parse-for-ddldatabase", true);
if (!"AS_IS".equals(defaultNameCase)) {
ctx.configuration().set(new DefaultVisitListener() {
@Override

38
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -321,6 +321,8 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jooq.AggregateFilterStep;
import org.jooq.AggregateFunction;
@ -473,7 +475,11 @@ import org.jooq.conf.ParseSearchSchema;
import org.jooq.conf.ParseUnknownFunctions;
import org.jooq.conf.ParseUnsupportedSyntax;
import org.jooq.conf.ParseWithMetaLookups;
import org.jooq.conf.RenderKeywordCase;
import org.jooq.conf.RenderNameCase;
import org.jooq.conf.RenderQuotedNames;
import org.jooq.conf.Settings;
import org.jooq.conf.SettingsTools;
import org.jooq.tools.reflect.Reflect;
import org.jooq.types.DayToSecond;
import org.jooq.types.Interval;
@ -530,7 +536,7 @@ final class ParserImpl implements Parser {
if (query == IGNORE || query == IGNORE_NO_DELIMITER)
continue;
if (query != null)
result.add(query);
result.add(patchParsedQuery(ctx, query));
}
while (query == IGNORE_NO_DELIMITER || parseDelimiterIf(ctx));
@ -538,6 +544,36 @@ final class ParserImpl implements Parser {
return dsl.queries(result);
}
private static final Pattern P_SEARCH_PATH = Pattern.compile("select\\s+(pg_catalog\\s*\\.\\s*)?set_config\\s*\\(\\s*'search_path'\\s*,\\s*'([^']*)'\\s*,\\s*\\w+\\s*\\)");
private final Query patchParsedQuery(ParserContext ctx, Query query) {
// [#8910] Some statements can be parsed differently when we know we're
// parsing them for the DDLDatabase. This method patches these
// statements.
if (TRUE.equals(ctx.configuration().data("org.jooq.meta.extensions.ddl.parse-for-ddldatabase"))) {
if (query instanceof Select) {
String sql =
ctx.configuration().derive(SettingsTools.clone(ctx.configuration().settings())
.withRenderFormatted(false)
.withRenderKeywordCase(RenderKeywordCase.LOWER)
.withRenderNameCase(RenderNameCase.LOWER)
.withRenderQuotedNames(RenderQuotedNames.NEVER)
.withRenderSchema(false))
.dsl()
.render(query);
// [#8910] special treatment for PostgreSQL pg_dump's curious
// usage of the SET SCHEMA command
Matcher matcher = P_SEARCH_PATH.matcher(sql);
if (matcher.find())
return ctx.configuration().dsl().setSchema(matcher.group(2));
}
}
return query;
}
@Override
public final Query parseQuery(String sql) {
return parseQuery(sql, new Object[0]);