Implement row movement clause for table creation (#974)

* visual

* implement row movement

* support row + AS

Co-authored-by: Jan Monterrubio <[email protected]>

Author: AnEmortalKid

src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java

@@ -28,6 +28,7 @@ public class CreateTable implements Statement {
     private Select select;
     private boolean selectParenthesis;
     private boolean ifNotExists = false;
+    private RowMovement rowMovement;
 
     @Override
     public void accept(StatementVisitor statementVisitor) {
@@ -118,6 +119,14 @@ public void setSelectParenthesis(boolean selectParenthesis) {
         this.selectParenthesis = selectParenthesis;
     }
 
+    public RowMovement getRowMovement() {
+        return rowMovement;
+    }
+
+    public void setRowMovement(RowMovement rowMovement) {
+        this.rowMovement = rowMovement;
+    }
+
     @Override
     public String toString() {
         String sql;
@@ -127,9 +136,7 @@ public String toString() {
                 + (!"".equals(createOps) ? createOps + " " : "")
                 + "TABLE " + (ifNotExists ? "IF NOT EXISTS " : "") + table;
 
-        if (select != null) {
-            sql += " AS " + (selectParenthesis ? "(" : "") + select.toString() + (selectParenthesis ? ")" : "");
-        } else {
+        if (columnDefinitions != null && !columnDefinitions.isEmpty()) {
             sql += " (";
 
             sql += PlainSelect.getStringList(columnDefinitions, true, false);
@@ -144,6 +151,12 @@ public String toString() {
             }
         }
 
+        if (rowMovement != null) {
+            sql += " " + rowMovement.getMode().toString() + " ROW MOVEMENT";
+        }
+        if (select != null) {
+            sql += " AS " + (selectParenthesis ? "(" : "") + select.toString() + (selectParenthesis ? ")" : "");
+        }
         return sql;
     }
 }

src/main/java/net/sf/jsqlparser/statement/create/table/RowMovement.java

@@ -0,0 +1,26 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2020 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.create.table;
+
+/**
+ * Holds data for the {@code row_movement} clause: https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_7002.htm#i2204697
+ */
+public class RowMovement {
+
+    private RowMovementMode mode;
+
+    public RowMovementMode getMode() {
+        return mode;
+    }
+
+    public void setMode(RowMovementMode mode) {
+        this.mode = mode;
+    }
+}

src/main/java/net/sf/jsqlparser/statement/create/table/RowMovementMode.java

@@ -0,0 +1,15 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2020 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.create.table;
+
+public enum RowMovementMode {
+    ENABLE, DISABLE;
+}
+

src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java

@@ -49,17 +49,7 @@ public void deParse(CreateTable createTable) {
             buffer.append("IF NOT EXISTS ");
         }
         buffer.append(createTable.getTable().getFullyQualifiedName());
-        if (createTable.getSelect() != null) {
-            buffer.append(" AS ");
-            if (createTable.isSelectParenthesis()) {
-                buffer.append("(");
-            }
-            Select sel = createTable.getSelect();
-            sel.accept(this.statementDeParser);
-            if (createTable.isSelectParenthesis()) {
-                buffer.append(")");
-            }
-        } else {
+
             if (createTable.getColumnDefinitions() != null) {
                 buffer.append(" (");
                 for (Iterator<ColumnDefinition> iter = createTable.getColumnDefinitions().iterator(); iter.
@@ -89,13 +79,27 @@ public void deParse(CreateTable createTable) {
                 }
 
                 buffer.append(")");
-            }
         }
 
         params = PlainSelect.getStringList(createTable.getTableOptionsStrings(), false, false);
         if (!"".equals(params)) {
             buffer.append(' ').append(params);
         }
+
+        if (createTable.getRowMovement() != null) {
+            buffer.append(' ').append(createTable.getRowMovement().getMode().toString()).append(" ROW MOVEMENT");
+        }
+        if (createTable.getSelect() != null) {
+            buffer.append(" AS ");
+            if (createTable.isSelectParenthesis()) {
+                buffer.append("(");
+            }
+            Select sel = createTable.getSelect();
+            sel.accept(this.statementDeParser);
+            if (createTable.isSelectParenthesis()) {
+                buffer.append(")");
+            }
+        }
     }
 
     public StringBuilder getBuffer() {

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

@@ -237,6 +237,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_MINUS:"MINUS">
 |   <K_MINVALUE:"MINVALUE">
 |   <K_MODIFY: "MODIFY">
+|   <K_MOVEMENT: "MOVEMENT">
 |   <K_NATURAL:"NATURAL">
 |   <K_NEXT:"NEXT">
 |   <K_NEXTVAL:"NEXTVAL">
@@ -3801,6 +3802,7 @@ CreateTable CreateTable():
     Select select = null;
     CheckConstraint checkCs = null;
     ExcludeConstraint excludeC = null;
+    RowMovement rowMovement = null;
 }
 {
     <K_CREATE>
@@ -3949,13 +3951,14 @@ CreateTable CreateTable():
         ")"
         (     parameter=CreateParameter() { tableOptions.addAll(parameter); } )*
         )
-        |
-        (
-        <K_AS> ( LOOKAHEAD("(" Select() ")") "(" select = Select() { createTable.setSelect(select, true); } ")"
-                 | select = Select() { createTable.setSelect(select, false); } )
-        )
     ]
-
+    // see https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_7002.htm#i2126725
+    // table properties , all these are optional
+    [ rowMovement = RowMovement() { createTable.setRowMovement(rowMovement); }]
+    [
+    <K_AS> ( LOOKAHEAD("(" Select() ")") "(" select = Select() { createTable.setSelect(select, true); } ")"
+             | select = Select() { createTable.setSelect(select, false); } )
+    ]
     {
         createTable.setTable(table);
         if (indexes.size() > 0)
@@ -4140,14 +4143,28 @@ List<String> CreateParameter():
             tk=<K_COLLATE> { param.add(tk.image); }
             |
             tk=<K_ASC> { param.add(tk.image); }
-	    |
+	        |
             tk=<K_DESC> { param.add(tk.image); }
             |
 	    tk="::" colDataType = ColDataType() { param.add(tk.image); param.add(colDataType.toString()); }
         )
     {return param;}
 }
 
+// row_movement_clause https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_7002.htm#i2204697
+RowMovement RowMovement():
+{
+  RowMovement rowMovement = new RowMovement();
+}
+{
+  (
+    (<K_ENABLE> <K_ROW> <K_MOVEMENT>) { rowMovement.setMode(RowMovementMode.ENABLE); }
+    |
+    (<K_DISABLE> <K_ROW> <K_MOVEMENT>) { rowMovement.setMode(RowMovementMode.DISABLE); }
+  )
+  { return rowMovement;}
+}
+
 String AList():
 {
     StringBuilder retval = new StringBuilder("(");

src/test/java/net/sf/jsqlparser/statement/create/CreateTableTest.java

@@ -9,26 +9,30 @@
  */
 package net.sf.jsqlparser.statement.create;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
 import net.sf.jsqlparser.statement.create.table.CreateTable;
 import net.sf.jsqlparser.statement.create.table.Index;
+import net.sf.jsqlparser.statement.create.table.RowMovementMode;
 import net.sf.jsqlparser.test.TestException;
-import static net.sf.jsqlparser.test.TestUtils.*;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import org.junit.Test;
 
 public class CreateTableTest {
 
@@ -609,4 +613,32 @@ public void testCreateTableWithCommentIssue922() throws JSQLParserException {
                 + "KEY name_ind (name) COMMENT 'comment for the name index'\n"
                 + ") ENGINE=InnoDB DEFAULT CHARSET=utf8", true);
     }
+
+    @Test
+    public void testEnableRowMovementOption() throws JSQLParserException {
+        String sql = "CREATE TABLE test (startdate DATE) ENABLE ROW MOVEMENT";
+
+        CreateTable createTable = (CreateTable) CCJSqlParserUtil.parse(sql);
+        Assertions.assertThat(createTable.getRowMovement()).isNotNull();
+        Assertions.assertThat(createTable.getRowMovement().getMode()).isEqualTo(RowMovementMode.ENABLE);
+
+        assertSqlCanBeParsedAndDeparsed(sql);
+    }
+
+    @Test
+    public void testDisableRowMovementOption() throws JSQLParserException {
+        String sql = "CREATE TABLE test (startdate DATE) DISABLE ROW MOVEMENT";
+
+        CreateTable createTable = (CreateTable) CCJSqlParserUtil.parse(sql);
+        Assertions.assertThat(createTable.getRowMovement()).isNotNull();
+        Assertions.assertThat(createTable.getRowMovement().getMode()).isEqualTo(RowMovementMode.DISABLE);
+
+        assertSqlCanBeParsedAndDeparsed(sql);
+    }
+
+    @Test
+    public void tableMovementWithAS() throws JSQLParserException {
+        String sql = "CREATE TABLE test (startdate DATE) DISABLE ROW MOVEMENT AS SELECT 1 FROM dual";
+        assertSqlCanBeParsedAndDeparsed(sql);
+    }
 }