Skip to content

Commit 6721051

Browse files
wumpzwumpz
committed
Merge origin/master
2 parents 89a9a57 + f3e04b3 commit 6721051

File tree

4 files changed

+30
-22
lines changed

4 files changed

+30
-22
lines changed

‎build.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@ repositories {
3131

3232
dependencies {
3333
testImplementation 'commons-io:commons-io:2.11.0'
34-
testImplementation 'junit:junit:4.13.2'
35-
testImplementation 'org.mockito:mockito-core:4.5.1'
36-
testImplementation 'org.assertj:assertj-core:3.22.0'
37-
testImplementation 'org.apache.commons:commons-lang3:3.12.0'
38-
testImplementation 'com.h2database:h2:2.1.212'
34+
35+
// This is needed for the Validation Framework tests
36+
testImplementation 'org.hamcrest:hamcrest-library:+'
37+
38+
testImplementation 'org.mockito:mockito-core:+'
39+
testImplementation 'org.assertj:assertj-core:+'
40+
testImplementation 'org.apache.commons:commons-lang3:+'
41+
testImplementation 'com.h2database:h2:2.+'
3942

4043
// for JaCoCo Reports
4144
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.+'

‎pom.xml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>net.java.dev.javacc</groupId>
3131
<artifactId>javacc</artifactId>
32-
<version>7.0.11</version>
32+
<version>7.0.12</version>
3333
</dependency>
3434

3535
<dependency>
@@ -41,13 +41,13 @@
4141
<dependency>
4242
<groupId>org.junit.jupiter</groupId>
4343
<artifactId>junit-jupiter</artifactId>
44-
<version>5.8.1</version>
44+
<version>5.9.0</version>
4545
<scope>test</scope>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.mockito</groupId>
4949
<artifactId>mockito-core</artifactId>
50-
<version>4.7.0</version>
50+
<version>4.8.0</version>
5151
<scope>test</scope>
5252
</dependency>
5353
<dependency>
@@ -71,9 +71,11 @@
7171
<dependency>
7272
<groupId>com.h2database</groupId>
7373
<artifactId>h2</artifactId>
74-
<version>2.1.210</version>
74+
<version>2.1.214</version>
7575
<scope>test</scope>
7676
</dependency>
77+
78+
<!-- This is needed for the Validation Framework tests -->
7779
<dependency>
7880
<groupId>org.hamcrest</groupId>
7981
<artifactId>hamcrest-all</artifactId>
@@ -114,6 +116,18 @@
114116

115117
<build>
116118
<plugins>
119+
<!-- Update they Keyword Whitelist in the Grammar's production RelObjectNameWithoutValue() -->
120+
<plugin>
121+
<groupId>org.codehaus.mojo</groupId>
122+
<artifactId>exec-maven-plugin</artifactId>
123+
<version>3.1.0</version>
124+
<configuration>
125+
<mainClass>net.sf.jsqlparser.parser.ParserKeywordsUtils</mainClass>
126+
<arguments>
127+
<argument>src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt</argument>
128+
</arguments>
129+
</configuration>
130+
</plugin>
117131
<plugin>
118132
<groupId>org.apache.maven.plugins</groupId>
119133
<artifactId>maven-pmd-plugin</artifactId>
@@ -153,18 +167,6 @@
153167
<artifactId>pmd-java</artifactId>
154168
<version>${pmdVersion}</version>
155169
</dependency>
156-
<!-- Do we really need those? What for?
157-
<dependency>
158-
<groupId>net.sourceforge.pmd</groupId>
159-
<artifactId>pmd-javascript</artifactId>
160-
<version>${pmdVersion}</version>
161-
</dependency>
162-
<dependency>
163-
<groupId>net.sourceforge.pmd</groupId>
164-
<artifactId>pmd-jsp</artifactId>
165-
<version>${pmdVersion}</version>
166-
</dependency>
167-
-->
168170
</dependencies>
169171
</plugin>
170172
<plugin>
@@ -338,6 +340,7 @@
338340
<exclude>net/sf/jsqlparser/JSQLParserException.class</exclude>
339341
</excludes>
340342
</instrumentation>
343+
<check/>
341344
</configuration>
342345
</plugin>
343346
<plugin>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,7 @@ String RelObjectNameWithoutValue() :
18271827
{ Token tk = null; }
18281828
{
18291829
( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION>
1830-
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | 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="CONFLICT" | tk="CONSTRAINTS" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | 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="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNQUIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="ZONE" )
1830+
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | 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="CONFLICT" | tk="CONSTRAINTS" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | 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="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNQUIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="ZONE" )
18311831
{ return tk.image; }
18321832
}
18331833

‎src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public class SpecialOracleTest {
135135
"function05.sql",
136136
"for_update04.sql",
137137
"for_update05.sql",
138+
"for_update06.sql",
138139
"for_update08.sql",
139140
"function01.sql",
140141
"function02.sql",
@@ -162,6 +163,7 @@ public class SpecialOracleTest {
162163
"insert02.sql",
163164
"interval02.sql",
164165
"interval04.sql",
166+
"interval05.sql",
165167
"join01.sql",
166168
"join02.sql",
167169
"join03.sql",

0 commit comments

Comments
 (0)