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

[#8261] [#7518] Added parser support for additional TRIM syntax

Browse Source
This commit is contained in:
lukaseder 2019-01-29 11:26:25 +01:00
parent c5f7714631
commit 570bc41f03
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.12.txt
View File

@ -766,7 +766,7 @@ term =
| 'ISNULL' '(' field ',' field ')'
| ( 'LOWER' | 'LCASE' ) '(' field ')'
| 'LPAD' '(' field ',' field [ ',' field ] ')'
| 'LTRIM' '(' field ')'
| 'LTRIM' '(' field [ ',' field ] ')'
| 'LEFT' '(' field ',' field ')'
| 'LEN' '(' field ')'
| 'LENGTH' '(' field ')'
@ -820,7 +820,7 @@ term =
| 'REPEAT' '(' field ',' field ')'
| 'REVERSE' '(' field ')'
| 'RPAD' '(' field ',' field [ ',' field ] ')'
| 'RTRIM' '(' field ')'
| 'RTRIM' '(' field [ ',' field ] ')'
| 'RIGHT' '(' field ',' field ')'
| 'ROW_NUMBER' '(' ')' over
| 'RANK' ( '(' ')' over | '(' fields ')' withinGroup )
@ -854,7 +854,8 @@ term =
| 'TO_NUMBER' '(' field ')'
| 'TO_TIMESTAMP' '(' field ',' field ')'
| ( 'TRANSLATE' | 'OTRANSLATE' ) '(' field ',' field ',' field ')'
| 'TRIM' '(' field ')'
| 'TRIM' '(' field [ ',' field ] ')'
| 'TRIM' '(' ( 'LEADING' | 'L' | 'TRAILING' | 'T' | 'BOTH' | 'B' ) [ field ] 'FROM' field ')'
| 'TRUNC' '(' field ',' stringLiteral ')'
| 'TRUNC' '(' numericOp ',' numericOp ')'
| truthValue

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

@ -6606,9 +6606,40 @@ final class ParserImpl implements Parser {
private static final Field<?> parseFieldTrimIf(ParserContext ctx) {
if (parseFunctionNameIf(ctx, "TRIM")) {
parse(ctx, '(');
int position = ctx.position();
boolean leading = parseKeywordIf(ctx, "LEADING") || parseKeywordIf(ctx, "L");
boolean trailing = !leading && (parseKeywordIf(ctx, "TRAILING") || parseKeywordIf(ctx, "T"));
boolean both = !leading && !trailing && (parseKeywordIf(ctx, "BOTH") || parseKeywordIf(ctx, "B"));
if ((leading || trailing || both) && parseIf(ctx, ',')) {
ctx.position(position);
}
else if ((leading || trailing || both) && parseKeywordIf(ctx, "FROM")) {
Field<String> f = (Field) parseField(ctx, S);
parse(ctx, ')');
return leading ? ltrim(f)
: trailing ? rtrim(f)
: trim(f);
}
Field<String> f1 = (Field) parseField(ctx, S);
parse(ctx, ')');
return trim(f1);
if (parseKeywordIf(ctx, "FROM")) {
Field<String> f2 = (Field) parseField(ctx, S);
parse(ctx, ')');
return leading ? ltrim(f2, f1)
: trailing ? rtrim(f2, f1)
: trim(f2, f1);
}
else {
Field<String> f2 = parseIf(ctx, ',') ? (Field) parseField(ctx, S) : null;
parse(ctx, ')');
return f2 == null ? trim(f1) : trim(f1, f2);
}
}
return null;
@ -6683,8 +6714,10 @@ final class ParserImpl implements Parser {
if (parseFunctionNameIf(ctx, "RTRIM")) {
parse(ctx, '(');
Field<String> f1 = (Field) parseField(ctx, S);
Field<String> f2 = parseIf(ctx, ',') ? (Field) parseField(ctx, S) : null;
parse(ctx, ')');
return rtrim(f1);
return f2 == null ? rtrim(f1) : rtrim(f1, f2);
}
return null;
@ -6694,8 +6727,10 @@ final class ParserImpl implements Parser {
if (parseFunctionNameIf(ctx, "LTRIM")) {
parse(ctx, '(');
Field<String> f1 = (Field) parseField(ctx, S);
Field<String> f2 = parseIf(ctx, ',') ? (Field) parseField(ctx, S) : null;
parse(ctx, ')');
return ltrim(f1);
return f2 == null ? ltrim(f1) : ltrim(f1, f2);
}
return null;