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

[#1677] [#2769] [#6485] Support RETURNING * and RETURNING t.*

Browse Source
This commit is contained in:
lukaseder 2018-02-01 16:06:16 +01:00
parent 7124fe0523
commit 6fcd413706
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1064,10 +1064,7 @@ final class ParserImpl implements Parser {
: s1;
if (parseKeywordIf(ctx, "RETURNING"))
if (parseIf(ctx, '*'))
return s2.returning();
else
return s2.returning(parseFields(ctx));
return s2.returning(parseSelectList(ctx));
else
return s2;
}
@ -1181,10 +1178,7 @@ final class ParserImpl implements Parser {
}
if (parseKeywordIf(ctx, "RETURNING"))
if (parseIf(ctx, '*'))
return returning.returning();
else
return returning.returning(parseFields(ctx));
return returning.returning(parseSelectList(ctx));
else
return returning;
}
@ -1201,17 +1195,14 @@ final class ParserImpl implements Parser {
// TODO support FROM
Condition condition = parseKeywordIf(ctx, "WHERE") ? parseCondition(ctx) : null;
UpdateReturningStep<?> returning = condition == null
UpdateReturningStep<?> s2 = condition == null
? s1.set(map)
: s1.set(map).where(condition);
if (parseKeywordIf(ctx, "RETURNING"))
if (parseIf(ctx, '*'))
return returning.returning();
else
return returning.returning(parseFields(ctx));
return s2.returning(parseSelectList(ctx));
else
return returning;
return s2;
}
private static final Map<Field<?>, Object> parseSetClauseList(ParserContext ctx) {