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

[#5955] Oracle doubly parenthesised ROW expressions

Browse Source
This commit is contained in:
lukaseder 2017-04-17 17:45:12 +02:00
parent c249962e08
commit 1bef9d4791
1 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2013,7 +2013,23 @@ class ParserImpl implements Parser {
private static final RowN parseTuple(ParserContext ctx, Integer degree, boolean allowDoubleParens) {
parse(ctx, '(');
RowN row = row(parseFields(ctx));
List<? extends FieldOrRow> fieldsOrRows;
if (allowDoubleParens)
fieldsOrRows = parseFieldsOrRows(ctx);
else
fieldsOrRows = parseFields(ctx);
RowN row;
if (fieldsOrRows.size() == 0)
row = row();
else if (fieldsOrRows.get(0) instanceof Field)
row = row(fieldsOrRows);
else if (fieldsOrRows.size() == 1)
row = (RowN) fieldsOrRows.get(0);
else
throw ctx.exception();
if (degree != null && row.size() != degree)
throw ctx.exception();
@ -2135,10 +2151,25 @@ class ParserImpl implements Parser {
return result;
}
private static final List<FieldOrRow> parseFieldsOrRows(ParserContext ctx) {
parseWhitespaceIf(ctx);
List<FieldOrRow> result = new ArrayList<FieldOrRow>();
do {
result.add(parseFieldOrRow(ctx));
}
while (parseIf(ctx, ','));
return result;
}
private static final Field<?> parseField(ParserContext ctx) {
return parseField(ctx, null);
}
private static final FieldOrRow parseFieldOrRow(ParserContext ctx) {
return parseFieldOrRow(ctx, null);
}
private static final RowN parseRow(ParserContext ctx) {
return parseRow(ctx, null);
}
@ -2189,6 +2220,13 @@ class ParserImpl implements Parser {
}
}
private static final FieldOrRow parseFieldOrRow(ParserContext ctx, Type type) {
if (B.is(type))
return toFieldOrRow(ctx, parseOr(ctx));
else
return parseConcat(ctx, type);
}
private static final Field<?> parseField(ParserContext ctx, Type type) {
if (B.is(type))
return toField(ctx, parseOr(ctx));
@ -2210,6 +2248,19 @@ class ParserImpl implements Parser {
throw ctx.exception();
}
private static final FieldOrRow toFieldOrRow(ParserContext ctx, QueryPart part) {
if (part == null)
return null;
else if (part instanceof Field)
return (Field) part;
else if (part instanceof Condition)
return field((Condition) part);
else if (part instanceof Row)
return (Row) part;
else
throw ctx.exception();
}
private static final Field<?> toField(ParserContext ctx, QueryPart part) {
if (part == null)
return null;
@ -2672,16 +2723,19 @@ class ParserImpl implements Parser {
return field;
}
else {
Field<?> r = parseField(ctx, type);
FieldOrRow r = parseFieldOrRow(ctx, type);
List<Field<?>> list = null;
while (parseIf(ctx, ',')) {
if (list == null) {
list = new ArrayList<Field<?>>();
list.add(r);
}
if (r instanceof Field) {
while (parseIf(ctx, ',')) {
if (list == null) {
list = new ArrayList<Field<?>>();
list.add((Field) r);
}
list.add(parseField(ctx, type));
// TODO Allow for nesting ROWs
list.add(parseField(ctx, type));
}
}
parse(ctx, ')');