Skip to content

Commit 93ca661

Browse files
ssteinhauserStefan Steinhausermanticore-projects
authored
Exasol support (#2046)
* feat: Support REGEXP_LIKE as LikeExpression Implement support of REGEXP_LIKE as LikeExpression as described here: https://docs.exasol.com/db/latest/sql_references/predicates/not_regexp_like.htm * feat: Support sub select as part of function parameters Allow unparenthesesed sub selects being part of multiple function parameters * fix: Readd mistakenly removed K_TEXT_LITERAL * revert: Revert code formatting changes * fix: Fix choice conflicts * refactor: Rename test methods * refactor: Apply on changed files * feat: Introduce allowUnparenthesizedSubSelects feature * refactor: Apply formatApply * test: add test for the standard grammar, expected to fail * test: make the performance tests more robust regarding the time-outs * style: reformat code Signed-off-by: Andreas Reichel <[email protected]> * fix: Revert default keyword changes * fix: Revert default keyword changes --------- Signed-off-by: Andreas Reichel <[email protected]> Co-authored-by: Stefan Steinhauser <[email protected]> Co-authored-by: Andreas Reichel <[email protected]>
1 parent 7e7acba commit 93ca661

File tree

10 files changed

+104
-37
lines changed

10 files changed

+104
-37
lines changed

‎build.gradle‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,21 +194,17 @@ test {
194194
// set heap size for the test JVM(s)
195195
minHeapSize = "128m"
196196
maxHeapSize = "1G"
197+
198+
jacoco {
199+
excludes = ['net/sf/jsqlparser/parser/CCJSqlParserTokenManager']
200+
}
197201
}
198202

199203
coveralls {
200204
jacocoReportPath 'build/reports/jacoco/test/jacocoTestReport.xml'
201205
}
202206

203207
jacocoTestReport {
204-
// Jacoco can't handle the TokenManager class
205-
afterEvaluate {
206-
classDirectories.setFrom(files(classDirectories.files.collect {
207-
fileTree(dir: it, exclude: [
208-
"**CCJSqlParserTokenManager**"
209-
])
210-
}))
211-
}
212208
dependsOn test // tests are required to run before generating the report
213209
reports {
214210
xml.required = false

‎src/main/java/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public LikeExpression withRightExpression(Expression arg0) {
117117
}
118118

119119
public enum KeyWord {
120-
LIKE, ILIKE, RLIKE, REGEXP, SIMILAR_TO;
120+
LIKE, ILIKE, RLIKE, REGEXP_LIKE, REGEXP, SIMILAR_TO;
121121

122122
public static KeyWord from(String keyword) {
123123
return Enum.valueOf(KeyWord.class, keyword.toUpperCase().replaceAll("\\s+", "_"));

‎src/main/java/net/sf/jsqlparser/parser/AbstractJSqlParser.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ public P withBackslashEscapeCharacter(boolean allowBackslashEscapeCharacter) {
6565
return withFeature(Feature.allowBackslashEscapeCharacter, allowBackslashEscapeCharacter);
6666
}
6767

68+
public P withUnparenthesizedSubSelects() {
69+
return withFeature(Feature.allowUnparenthesizedSubSelects, true);
70+
}
71+
72+
public P withUnparenthesizedSubSelects(boolean allowUnparenthesizedSubSelects) {
73+
return withFeature(Feature.allowUnparenthesizedSubSelects, allowUnparenthesizedSubSelects);
74+
}
75+
6876
public P withFeature(Feature f, boolean enabled) {
6977
getConfiguration().setValue(f, enabled);
7078
return me();

‎src/main/java/net/sf/jsqlparser/parser/feature/Feature.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,11 @@ public enum Feature {
787787
* allows Backslash '\' as Escape Character
788788
*/
789789
allowBackslashEscapeCharacter(false),
790+
791+
/**
792+
* allows sub selects without parentheses, e.g. `select * from dual where 1 = select 1`
793+
*/
794+
allowUnparenthesizedSubSelects(false),
790795
;
791796

792797
private final Object value;

‎src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
396396
| <K_REGEXP: "REGEXP">
397397
| <K_RESPECT: "RESPECT">
398398
| <K_RLIKE: "RLIKE">
399+
| <K_REGEXP_LIKE: "REGEXP_LIKE">
399400
| <K_REGISTER: "REGISTER">
400401
| <K_REMOTE: "REMOTE">
401402
| <K_RENAME:"RENAME">
@@ -1993,7 +1994,7 @@ String RelObjectNameWithoutValue() :
19931994
{ Token tk = null; }
19941995
{
19951996
( tk=<DATA_TYPE> | tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> | tk=<K_TEXT_LITERAL>
1996-
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
1997+
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
19971998
{ return tk.image; }
19981999
}
19992000

@@ -2382,7 +2383,7 @@ List<LateralView> LateralViews():
23822383
}
23832384
{
23842385
lateralView = LateralView() { lateralViews.add(lateralView); }
2385-
( lateralView = LateralView() { lateralViews.add(lateralView); } )*
2386+
( LOOKAHEAD(2) lateralView = LateralView() { lateralViews.add(lateralView); } )*
23862387

23872388
{
23882389
return lateralViews;
@@ -2487,11 +2488,11 @@ PlainSelect PlainSelect() #PlainSelect:
24872488

24882489
[ LOOKAHEAD(2) intoTables = IntoClause() { plainSelect.setIntoTables(intoTables); } ]
24892490
[ LOOKAHEAD(2) <K_FROM> fromItem=FromItem()
2490-
[ lateralViews=LateralViews() ]
2491+
[ LOOKAHEAD(2) lateralViews=LateralViews() ]
24912492
[ LOOKAHEAD(2) joins=JoinsList() ]
24922493
]
24932494
[ LOOKAHEAD(3) <K_FROM> <K_ONLY> { plainSelect.setUsingOnly(true); } fromItem=FromItem()
2494-
[ lateralViews=LateralViews() ]
2495+
[ LOOKAHEAD(2) lateralViews=LateralViews() ]
24952496
[ LOOKAHEAD(2) joins=JoinsList() ]
24962497
]
24972498

@@ -4004,6 +4005,7 @@ Expression LikeExpression(Expression leftExpression) #LikeExpression:
40044005
token = <K_LIKE>
40054006
| token = <K_ILIKE>
40064007
| token = <K_RLIKE>
4008+
| token = <K_REGEXP_LIKE>
40074009
| token = <K_REGEXP>
40084010
| token = <K_SIMILAR_TO>
40094011
) { result.setLikeKeyWord( LikeExpression.KeyWord.from(token.image)); }
@@ -4613,7 +4615,9 @@ Expression PrimaryExpression() #PrimaryExpression:
46134615

46144616
| "{ts" token=<S_CHAR_LITERAL> "}" { retval = new TimestampValue(token.image); }
46154617

4616-
| LOOKAHEAD( ParenthesedSelect() , {!interrupted} ) retval=ParenthesedSelect()
4618+
| LOOKAHEAD( Select() , { getAsBoolean(Feature.allowUnparenthesizedSubSelects) && !interrupted } ) retval=Select()
4619+
4620+
| LOOKAHEAD( ParenthesedSelect() , { !getAsBoolean(Feature.allowUnparenthesizedSubSelects) && !interrupted } ) retval=ParenthesedSelect()
46174621

46184622
|
46194623
(
@@ -5655,7 +5659,7 @@ Function InternalFunction(boolean escaped):
56555659
|
56565660
LOOKAHEAD(3) expressionList=ExpressionList() [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ]
56575661
|
5658-
expr = Select() { expressionList = new ExpressionList(expr); }
5662+
LOOKAHEAD({ !getAsBoolean(Feature.allowUnparenthesizedSubSelects) }) expr = Select() { expressionList = new ExpressionList(expr); }
56595663
)
56605664
]
56615665

‎src/site/sphinx/keywords.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The following Keywords are **restricted** in JSQLParser-|JSQLPARSER_VERSION| and
3939
+----------------------+-------------+-----------+
4040
| DEFAULT | Yes | |
4141
+----------------------+-------------+-----------+
42-
| DISTINCT | Yes | Yes |
42+
| DISTINCT | Yes | Yes |
4343
+----------------------+-------------+-----------+
4444
| DOUBLE | Yes | |
4545
+----------------------+-------------+-----------+

‎src/test/java/net/sf/jsqlparser/expression/FunctionTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ void testSubSelectArrayWithoutKeywordParameter() throws JSQLParserException {
7676
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
7777
}
7878

79+
@Test
80+
void testSubSelectParameterWithoutParentheses() throws JSQLParserException {
81+
String sqlStr = "SELECT COALESCE(SELECT mycolumn FROM mytable, 0)";
82+
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true,
83+
parser -> parser.withUnparenthesizedSubSelects(true));
84+
}
85+
7986
@Test
8087
void testSimpleFunctionIssue2059() throws JSQLParserException {
8188
String sqlStr = "select count(*) from zzz";

0 commit comments

Comments
 (0)