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

[#6485] Added support for parsing the DELIMITER command

Browse Source
This commit is contained in:
lukaseder 2018-01-16 13:09:17 +01:00
parent e43b0e28b3
commit 3d416686f9
1 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,12 +373,14 @@ final class ParserImpl implements Parser {
public final Queries parse(String sql, Object... bindings) {
ParserContext ctx = new ParserContext(dsl, sql, bindings);
List<Query> result = new ArrayList<Query>();
do {
parseDelimiters(ctx);
Query query = parseQuery(ctx, false);
if (query != null)
result.add(query);
}
while (parseIf(ctx, ";"));
while (parseIf(ctx, ctx.delimiter));
ctx.done("Unexpected content after end of queries input");
return dsl.queries(result);
@ -482,6 +484,15 @@ final class ParserImpl implements Parser {
return result;
}
private static final void parseDelimiters(ParserContext ctx) {
while (parseKeywordIf(ctx, "DELIMITER")) {
if (ctx.character() != ' ')
throw ctx.unexpectedToken();
ctx.delimiter = parseUntilEOL(ctx).trim();
}
}
private static final Query parseQuery(ParserContext ctx, boolean resultQuery) {
parseWhitespaceIf(ctx);
if (ctx.done())
@ -6280,6 +6291,31 @@ final class ParserImpl implements Parser {
// Other tokens
// -----------------------------------------------------------------------------------------------------------------
private static final String parseUntilEOL(ParserContext ctx) {
parseWhitespaceIf(ctx);
int start = ctx.position;
int stop = start;
for (; stop < ctx.sql.length; stop++) {
char c = ctx.character(stop);
if (c == '\r') {
if (ctx.character(stop + 1) == '\n')
stop++;
break;
}
else if (c == '\n')
break;
}
if (start == stop)
throw ctx.unexpectedToken();
ctx.position = stop;
return new String(ctx.sql, start, stop - start);
}
private static final boolean parseIf(ParserContext ctx, String string) {
parseWhitespaceIf(ctx);
int length = string.length();
@ -6510,12 +6546,13 @@ final class ParserImpl implements Parser {
}
static final class ParserContext {
private final DSLContext dsl;
private final String sqlString;
private final char[] sql;
private int position = 0;
private final Object[] bindings;
private int bindIndex = 0;
final DSLContext dsl;
final String sqlString;
final char[] sql;
int position = 0;
final Object[] bindings;
int bindIndex = 0;
String delimiter = ";";
ParserContext(DSLContext dsl, String sqlString, Object[] bindings) {
this.dsl = dsl;