Fix jjt

JSQLParser · manticore-projects · Dec 11, 2023 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
commit f78139b23918652282ea9b98d40fd002b7999e98
diff --git a/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java b/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java
@@ -15,16 +15,16 @@
 
 /**
  * REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] name [ WITH [ NO ] DATA ]
- * 
+ * <p>
  * https://www.postgresql.org/docs/16/sql-refreshmaterializedview.html
- * 
+ *
  * @author jxni-liguobin
  */
 
 public class RefreshMaterializedViewStatement implements Statement {
 
     private Table view;
-    private RefreshMode refreshMode = RefreshMode.DEFAULT;
+    private RefreshMode refreshMode;
     private boolean concurrently = false;
 
     public RefreshMaterializedViewStatement() {}
@@ -65,6 +65,13 @@ public void setConcurrently(boolean concurrently) {
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("REFRESH MATERIALIZED VIEW ");
+        if (this.refreshMode == null) {
+            if (concurrently) {
+                builder.append("CONCURRENTLY ");
+            }
+            builder.append(view);
+            return builder.toString();
+        }
         switch (this.refreshMode) {
             case WITH_DATA:
                 if (concurrently) {
@@ -79,12 +86,6 @@ public String toString() {
                     builder.append(" WITH NO DATA");
                 }
                 break;
-            case DEFAULT:
-                if (concurrently) {
-                    builder.append("CONCURRENTLY ");
-                }
-                builder.append(view);
-                break;
         }
         return builder.toString();
     }

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/RefreshMaterializedViewStatementDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/RefreshMaterializedViewStatementDeParser.java
@@ -12,7 +12,6 @@
 import net.sf.jsqlparser.statement.refresh.RefreshMaterializedViewStatement;
 
 /**
- *
  * @author jxnu-liguobin
  */
 
@@ -27,6 +26,13 @@ public RefreshMaterializedViewStatementDeParser(StringBuilder buffer) {
     @Override
     public void deParse(RefreshMaterializedViewStatement view) {
         buffer.append("REFRESH MATERIALIZED VIEW ");
+        if (view.getRefreshMode() == null) {
+            if (view.isConcurrently()) {
+                buffer.append("CONCURRENTLY ");
+            }
+            buffer.append(view.getView());
+            return;
+        }
         switch (view.getRefreshMode()) {
             case WITH_DATA:
                 if (view.isConcurrently()) {
@@ -41,12 +47,6 @@ public void deParse(RefreshMaterializedViewStatement view) {
                     buffer.append(" WITH NO DATA");
                 }
                 break;
-            case DEFAULT:
-                if (view.isConcurrently()) {
-                    buffer.append("CONCURRENTLY ");
-                }
-                buffer.append(view.getView());
-                break;
         }
     }
 

diff --git a/...et/sf/jsqlparser/util/validation/validator/RefreshMaterializedViewStatementValidator.java b/...et/sf/jsqlparser/util/validation/validator/RefreshMaterializedViewStatementValidator.java
@@ -11,7 +11,6 @@
 
 import net.sf.jsqlparser.parser.feature.Feature;
 import net.sf.jsqlparser.statement.refresh.RefreshMaterializedViewStatement;
-import net.sf.jsqlparser.statement.refresh.RefreshMode;
 import net.sf.jsqlparser.util.validation.ValidationCapability;
 import net.sf.jsqlparser.util.validation.metadata.NamedObject;
 
@@ -28,30 +27,12 @@ public void validate(RefreshMaterializedViewStatement viewStatement) {
                 viewStatement.getView().getName());
         for (ValidationCapability c : getCapabilities()) {
             // default
-            validateFeature(c,
-                    viewStatement.getRefreshMode() == RefreshMode.DEFAULT
-                            && !viewStatement.isConcurrently(),
+            validateFeature(c, viewStatement.getRefreshMode() == null,
                     Feature.refreshMaterializedView);
-            validateFeature(c,
-                    viewStatement.getRefreshMode() == RefreshMode.DEFAULT
-                            && viewStatement.isConcurrently(),
-                    Feature.refreshMaterializedView);
-
             // specify WITH DATA
-            validateFeature(c, viewStatement.getRefreshMode() == RefreshMode.WITH_DATA &&
-                    !viewStatement.isConcurrently(),
+            validateOptionalFeature(c, viewStatement.getRefreshMode(),
                     Feature.refreshMaterializedWithDataView);
-
-            // specify WITH DATA and CONCURRENTLY
-            validateOptionalFeature(c,
-                    viewStatement.getRefreshMode() == RefreshMode.WITH_DATA
-                            && viewStatement.isConcurrently(),
-                    Feature.refreshMaterializedWithDataView);
-
-            // specify WITH NO DATA
-            validateOptionalFeature(c,
-                    viewStatement.getRefreshMode() == RefreshMode.WITH_NO_DATA
-                            && !viewStatement.isConcurrently(),
+            validateOptionalFeature(c, viewStatement.getRefreshMode(),
                     Feature.refreshMaterializedWithNoDataView);
         }
     }

diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1227,7 +1227,7 @@ ShowIndexStatement ShowIndex(): {
 Statement RefreshMaterializedView(): {
     Table view = null;
     boolean concurrently = false;
-    RefreshMode refreshMode = RefreshMode.DEFAULT;
+    RefreshMode refreshMode = null;
     List<String> captureRest;
 }
 {

diff --git a/...f/jsqlparser/util/validation/validator/RefreshMaterializedViewStatementValidatorTest.java b/...f/jsqlparser/util/validation/validator/RefreshMaterializedViewStatementValidatorTest.java
@@ -17,7 +17,6 @@
 import org.junit.jupiter.api.Test;
 
 /**
- *
  * @author jxnu-liguobin
  */
 
@@ -53,10 +52,15 @@ public void testValidationRefreshWithConcurrently() throws Exception {
     @Test
     public void testValidationRefreshNotAllowed() throws Exception {
         for (String sql : Arrays.asList("REFRESH MATERIALIZED VIEW my_view")) {
-            validateNotAllowed(sql, 1, 1, FeaturesAllowed.DML,
-                    Feature.refreshMaterializedView,
-                    Feature.refreshMaterializedWithNoDataView,
-                    Feature.refreshMaterializedWithDataView);
+            validateNotAllowed(sql, 1, 1, FeaturesAllowed.SELECT,
+                    Feature.refreshMaterializedView);
+        }
+
+        for (String sql : Arrays
+                .asList("REFRESH MATERIALIZED VIEW CONCURRENTLY my_view WITH DATA")) {
+            validateNotAllowed(sql, 1, 1, FeaturesAllowed.SELECT,
+                    Feature.refreshMaterializedView, Feature.refreshMaterializedWithDataView,
+                    Feature.refreshMaterializedWithNoDataView);
         }
     }
 }