feat: DROP TEMPORARY TABLE ...

manticore-projects · manticore-projects · commit f01bf42e998b · 2023-01-11T21:08:20.000+07:00
fixes #1712
diff --git a/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java b/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
@@ -29,6 +29,8 @@ public class Drop implements Statement {
     private Map<String, List<String>> typeToParameters = new HashMap<>();
     private boolean ifExists = false;
 
+    private boolean isUsingTemporary;
+
     @Override
     public void accept(StatementVisitor statementVisitor) {
         statementVisitor.visit(this);
@@ -66,6 +68,19 @@ public void setIfExists(boolean ifExists) {
         this.ifExists = ifExists;
     }
 
+    public boolean isUsingTemporary() {
+        return isUsingTemporary;
+    }
+
+    public void setUsingTemporary(boolean useTemporary) {
+        this.isUsingTemporary=useTemporary;
+    }
+
+    public Drop withUsingTemporary(boolean useTemporary) {
+        setUsingTemporary(useTemporary);
+        return this;
+    }
+
     public Map<String, List<String>> getTypeToParameters() {
         return typeToParameters;
     }
@@ -76,7 +91,7 @@ public void setTypeToParameters(Map<String, List<String>> typeToParameters) {
 
     @Override
     public String toString() {
-        String sql = "DROP " + type + " "
+        String sql = "DROP " + ( isUsingTemporary? "TEMPORARY " : "") + type + " "
                 + (ifExists ? "IF EXISTS " : "") + name.toString();
 
         if (type.equals("FUNCTION")) {
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/DropDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/DropDeParser.java
@@ -21,6 +21,9 @@ public DropDeParser(StringBuilder buffer) {
     @Override
     public void deParse(Drop drop) {
         buffer.append("DROP ");
+        if (drop.isUsingTemporary()) {
+            buffer.append("TEMPORARY ");
+        }
         buffer.append(drop.getType());
         if (drop.isIfExists()) {
             buffer.append(" IF EXISTS");
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -5754,13 +5754,16 @@ Drop Drop():
     Table name;
     List<String> dropArgs = new ArrayList<String>();
     List<String> funcArgs = null;
+    boolean useTemporary = false;
 }
 {
     <K_DROP>
     (
         tk=<S_IDENTIFIER>
         |
-        tk=<K_TABLE>
+        (
+            [ <K_TEMPORARY> {useTemporary=true;} ] tk=<K_TABLE>
+        )
         |
         tk=<K_INDEX>
         |
@@ -5788,6 +5791,8 @@ Drop Drop():
             drop.getTypeToParameters().put("FUNCTION", funcArgs);
         }
 
+        drop.setUsingTemporary(useTemporary);
+
         return drop;
     }
 }
diff --git a/src/test/java/net/sf/jsqlparser/statement/drop/DropTest.java b/src/test/java/net/sf/jsqlparser/statement/drop/DropTest.java
@@ -127,4 +127,10 @@ public void testDropFunctionWithNameAndType() throws JSQLParserException {
     public void testDropFunctionWithNameAndParameterizedType() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DROP FUNCTION myFunc(amount integer, name varchar(255))");
     }
+
+    @Test
+    void dropTemporaryTableTestIssue1712() throws JSQLParserException {
+        String sqlStr="drop temporary table if exists tmp_MwYT8N0z";
+        assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }
diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/insert01.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/insert01.sql
@@ -14,4 +14,5 @@ insert
     into t2 ( x, y ) values ( s.nextval, created )
 select object_id, created from all_objects
 
---@FAILURE: Encountered unexpected token: "when" "WHEN" recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "when" "WHEN" recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "insert" "INSERT" recorded first on 11 Jan 2023, 21:07:10
diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/insert03.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/insert03.sql
@@ -23,4 +23,5 @@ else
   values (empno,ename,job,mgr,sal,deptno)
 select * from emp
 
---@FAILURE: Encountered unexpected token: "when" "WHEN" recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "when" "WHEN" recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "insert" "INSERT" recorded first on 11 Jan 2023, 21:07:10
diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/numbers01.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/numbers01.sql
@@ -32,4 +32,5 @@ select 25
 from dual
 
 
---@FAILURE: Encountered unexpected token: "d" <S_IDENTIFIER> recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "d" <S_IDENTIFIER> recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: select 25,+6.34,0.5,25e-03,-1,25f,+6.34 f,0.5 d,-1d,1.,.5,(sysdate-1d),sysdate-1m,sysdate-1dm,1.-+.5,1.+.5,1.+.5 d,1.+.5 dm,1. d,1. m,.5 m,.5 dm from dual recorded first on 11 Jan 2023, 21:07:10

Original file line number	Diff line number	Diff line change
`@@ -5754,13 +5754,16 @@ Drop Drop():`
`5754`	`5754`	`Table name;`
`5755`	`5755`	`List<String> dropArgs = new ArrayList<String>();`
`5756`	`5756`	`List<String> funcArgs = null;`
	`5757`	`+ boolean useTemporary = false;`
`5757`	`5758`	`}`
`5758`	`5759`	`{`
`5759`	`5760`	`<K_DROP>`
`5760`	`5761`	`(`
`5761`	`5762`	`tk=<S_IDENTIFIER>`
`5762`	`5763`	`\|`
`5763`		`- tk=<K_TABLE>`
	`5764`	`+ (`
	`5765`	`+ [ <K_TEMPORARY> {useTemporary=true;} ] tk=<K_TABLE>`
	`5766`	`+ )`
`5764`	`5767`	`\|`
`5765`	`5768`	`tk=<K_INDEX>`
`5766`	`5769`	`\|`
`@@ -5788,6 +5791,8 @@ Drop Drop():`
`5788`	`5791`	`drop.getTypeToParameters().put("FUNCTION", funcArgs);`
`5789`	`5792`	`}`
`5790`	`5793`
	`5794`	`+ drop.setUsingTemporary(useTemporary);`
	`5795`	`+`
`5791`	`5796`	`return drop;`
`5792`	`5797`	`}`
`5793`	`5798`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,4 +127,10 @@ public void testDropFunctionWithNameAndType() throws JSQLParserException {`
`127`	`127`	`public void testDropFunctionWithNameAndParameterizedType() throws JSQLParserException {`
`128`	`128`	`assertSqlCanBeParsedAndDeparsed("DROP FUNCTION myFunc(amount integer, name varchar(255))");`
`129`	`129`	`}`
	`130`	`+`
	`131`	`+ @Test`
	`132`	`+ void dropTemporaryTableTestIssue1712() throws JSQLParserException {`
	`133`	`+ String sqlStr="drop temporary table if exists tmp_MwYT8N0z";`
	`134`	`+ assertSqlCanBeParsedAndDeparsed(sqlStr, true);`
	`135`	`+ }`
`130`	`136`	`}`