Merge remote-tracking branch 'origin/master' into upsert_sqlite

manticore-projects · manticore-projects · commit 0575519005f1 · 2023-01-14T01:05:55.000+07:00
# Conflicts:
#	src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
#	src/main/java/net/sf/jsqlparser/util/deparser/DropDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java b/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
@@ -28,6 +28,7 @@ public class Drop implements Statement {
     private List<String> parameters;
     private Map<String, List<String>> typeToParameters = new HashMap<>();
     private boolean ifExists = false;
+    private boolean materialized = false;
 
     private boolean isUsingTemporary;
 
@@ -81,6 +82,14 @@ public Drop withUsingTemporary(boolean useTemporary) {
         return this;
     }
 
+    public boolean isMaterialized() {
+        return materialized;
+    }
+
+    public void setMaterialized(boolean materialized) {
+        this.materialized = materialized;
+    }
+
     public Map<String, List<String>> getTypeToParameters() {
         return typeToParameters;
     }
@@ -91,7 +100,10 @@ public void setTypeToParameters(Map<String, List<String>> typeToParameters) {
 
     @Override
     public String toString() {
-        String sql = "DROP " + ( isUsingTemporary? "TEMPORARY " : "") + type + " "
+        String sql = "DROP "
+                + (isUsingTemporary ? "TEMPORARY " : "")
+                + (materialized ? "MATERIALIZED " : "")
+                + type + " "
                 + (ifExists ? "IF EXISTS " : "") + name.toString();
 
         if (type.equals("FUNCTION")) {
@@ -121,6 +133,11 @@ public Drop withIfExists(boolean ifExists) {
         return this;
     }
 
+    public Drop withMaterialized(boolean materialized) {
+        this.setMaterialized(materialized);
+        return this;
+    }
+
     public Drop withType(String type) {
         this.setType(type);
         return this;
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/DropDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/DropDeParser.java
@@ -24,6 +24,9 @@ public void deParse(Drop drop) {
         if (drop.isUsingTemporary()) {
             buffer.append("TEMPORARY ");
         }
+        if (drop.isMaterialized()) {
+            buffer.append("MATERIALIZED ");
+        }
         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
@@ -5758,6 +5758,7 @@ Drop Drop():
 }
 {
     <K_DROP>
+    [ <K_MATERIALIZED> { drop.setMaterialized(true);} ]
     (
         tk=<S_IDENTIFIER>
         |
diff --git a/src/test/java/net/sf/jsqlparser/statement/drop/DropTest.java b/src/test/java/net/sf/jsqlparser/statement/drop/DropTest.java
@@ -87,6 +87,11 @@ public void testDropViewIssue545_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DROP VIEW IF EXISTS myview");
     }
 
+    @Test
+    public void testDropMaterializedView() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("DROP MATERIALIZED VIEW myview");
+    }
+
     @Test
     public void testDropSchemaIssue855() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DROP SCHEMA myschema");

Original file line number	Diff line number	Diff line change
`@@ -5758,6 +5758,7 @@ Drop Drop():`
`5758`	`5758`	`}`
`5759`	`5759`	`{`
`5760`	`5760`	`<K_DROP>`
	`5761`	`+ [ <K_MATERIALIZED> { drop.setMaterialized(true);} ]`
`5761`	`5762`	`(`
`5762`	`5763`	`tk=<S_IDENTIFIER>`
`5763`	`5764`	`\|`