Merge branch 'master' of github.com:JSQLParser/JSqlParser into Keywords

manticore-projects · manticore-projects · commit c512b8e8fd51 · 2022-09-02T14:16:39.000+07:00
diff --git a/src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java b/src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java
@@ -53,6 +53,6 @@ public DateTimeLiteralExpression withType(DateTime type) {
     }
 
     public enum DateTime {
-        DATE, TIME, TIMESTAMP;
+        DATE, TIME, TIMESTAMP, TIMESTAMPTZ;
     }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java b/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
@@ -84,7 +84,7 @@ public String toString() {
         }
 
         if (parameters != null && !parameters.isEmpty()) {
-            sql += " " + PlainSelect.getStringList(parameters);
+            sql += " " + PlainSelect.getStringList(parameters, false, false);
         }
 
         return sql;
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/DropDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/DropDeParser.java
@@ -33,7 +33,7 @@ public void deParse(Drop drop) {
         }
 
         if (drop.getParameters() != null && !drop.getParameters().isEmpty()) {
-            buffer.append(" ").append(PlainSelect.getStringList(drop.getParameters()));
+            buffer.append(" ").append(PlainSelect.getStringList(drop.getParameters(), false, false));
         }
     }
 
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -188,7 +188,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_CYCLE:"CYCLE">
 |   <K_DATABASE:"DATABASE">
 |   <K_DECLARE: "DECLARE">
-|   <K_DATETIMELITERAL : ("DATE" | "TIME" | "TIMESTAMP") >
+|   <K_DATETIMELITERAL : ("DATE" | "TIME" | "TIMESTAMP" | "TIMESTAMPTZ") >
 |   <K_DATE_LITERAL : ( "YEAR" | "MONTH" | "DAY" | "HOUR" | "MINUTE" | "SECOND" ) >
 |   <K_DBA_RECYCLEBIN: "DBA_RECYCLEBIN">
 |   <K_DEFAULT : "DEFAULT">
@@ -5662,7 +5662,7 @@ Drop Drop():
 
     name = Table() { drop.setName(name); }
     [ funcArgs = FuncArgsList() ]
-    ((tk=<S_IDENTIFIER> | tk=<K_CASCADE> | tk=<K_RESTRICT> ) { dropArgs.add(tk.image); })*
+    ((tk=<S_IDENTIFIER> | tk=<K_CASCADE> | tk=<K_RESTRICT> | tk=<K_ON>) { dropArgs.add(tk.image); })*
 
     {
         if (dropArgs.size() > 0) {
diff --git a/src/test/java/net/sf/jsqlparser/statement/drop/DropTest.java b/src/test/java/net/sf/jsqlparser/statement/drop/DropTest.java
@@ -46,6 +46,11 @@ public void testDropIndex() throws JSQLParserException {
         assertDeparse(created, statement);
         assertEqualsObjectTree(parsed, created);
     }
+    
+    @Test
+    public void testDropIndexOnTable() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("DROP INDEX idx ON abc");
+    }
 
     @Test
     public void testDrop2() throws JSQLParserException {
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/interval05.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/interval05.sql
@@ -10,4 +10,5 @@
 -- see metalink note 1056382.1
 select 'yes' from dual where (sysdate-5,sysdate) overlaps (sysdate-2,sysdate-1)
 
---@FAILURE: Encountered unexpected token: "overlaps" <S_IDENTIFIER> recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "overlaps" <S_IDENTIFIER> recorded first on Aug 3, 2021, 7:20:08 AM
+--@SUCCESSFULLY_PARSED_AND_DEPARSED first on 31.08.2022 20:18:36

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,6 @@ public DateTimeLiteralExpression withType(DateTime type) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public enum DateTime {`
`56`		`- DATE, TIME, TIMESTAMP;`
	`56`	`+ DATE, TIME, TIMESTAMP, TIMESTAMPTZ;`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public String toString() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if (parameters != null && !parameters.isEmpty()) {`
`87`		`- sql += " " + PlainSelect.getStringList(parameters);`
	`87`	`+ sql += " " + PlainSelect.getStringList(parameters, false, false);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`return sql;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void deParse(Drop drop) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (drop.getParameters() != null && !drop.getParameters().isEmpty()) {`
`36`		`- buffer.append(" ").append(PlainSelect.getStringList(drop.getParameters()));`
	`36`	`+ buffer.append(" ").append(PlainSelect.getStringList(drop.getParameters(), false, false));`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`