Merge origin/master

wumpz · wumpz · commit d7e3b555f9d0 · 2019-02-08T00:21:49.000+01:00
diff --git a/src/main/java/net/sf/jsqlparser/schema/Table.java b/src/main/java/net/sf/jsqlparser/schema/Table.java
@@ -51,19 +51,18 @@ public Table() {
     }
 
     public Table(String name) {
-        setIndex(NAME_IDX, name);
+        setName(name);
     }
 
     public Table(String schemaName, String name) {
-        setIndex(NAME_IDX, name);
-        setIndex(SCHEMA_IDX, schemaName);
+        setName(name);
+        setSchemaName(schemaName);
     }
 
     public Table(Database database, String schemaName, String name) {
-        setIndex(NAME_IDX, name);
-        setIndex(SCHEMA_IDX, schemaName);
-        setIndex(DATABASE_IDX, database.getDatabaseName());
-        setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());
+        setName(name);
+        setSchemaName(schemaName);
+        setDatabase(database);
     }
 
     public Table(List<String> partItems) {
@@ -77,6 +76,7 @@ public Database getDatabase() {
 
     public void setDatabase(Database database) {
         setIndex(DATABASE_IDX, database.getDatabaseName());
+        setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());
     }
 
     public String getSchemaName() {
@@ -173,3 +173,4 @@ public String toString() {
                 + ((hint != null) ? hint.toString() : "");
     }
 }
+
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java
@@ -37,7 +37,9 @@
 public class AlterExpression {
 
     private AlterOperation operation;
+    private String optionalSpecifier;
     private String columnName;
+    private String columnOldName;
     //private ColDataType dataType;
 
     private List<ColumnDataType> colDataTypeList;
@@ -66,6 +68,14 @@ public void setOperation(AlterOperation operation) {
         this.operation = operation;
     }
 
+    public String getOptionalSpecifier() {
+        return optionalSpecifier;
+    }
+
+    public void setOptionalSpecifier(String optionalSpecifier) {
+        this.optionalSpecifier = optionalSpecifier;
+    }
+
     public boolean isOnDeleteCascade() {
         return onDeleteCascade;
     }
@@ -137,6 +147,14 @@ public void setColumnName(String columnName) {
         this.columnName = columnName;
     }
 
+    public String getColOldName() {
+        return columnOldName;
+    }
+
+    public void setColOldName(String columnOldName) {
+        this.columnOldName = columnOldName;
+    }
+
     public String getConstraintName() {
         return this.constraintName;
     }
@@ -214,7 +232,12 @@ public String toString() {
         if (columnName != null) {
             b.append("COLUMN ").append(columnName);
         } else if (getColDataTypeList() != null) {
-            if (colDataTypeList.size() > 1) {
+            if(operation == AlterOperation.CHANGE) {
+                if(optionalSpecifier != null) {
+                    b.append(optionalSpecifier).append(" ");
+                }
+                b.append(columnOldName).append(" ");
+            } else if (colDataTypeList.size() > 1) {
                 b.append("(");
             } else {
                 b.append("COLUMN ");
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -158,6 +158,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_CASE:"CASE">
 |   <K_CAST:"CAST">
 |   <K_CHARACTER:"CHARACTER">
+|   <K_CHANGE:"CHANGE">
 |   <K_CHECK:"CHECK">
 |   <K_CHAR:"CHAR">
 |   <K_COLUMN:"COLUMN">
@@ -3601,6 +3602,8 @@ List<String> CreateParameter():
             tk=<K_IN> { param.add(tk.image); }
 			|
             tk=<K_TYPE> { param.add(tk.image); }
+			|
+            tk=<K_COMMENT> { param.add(tk.image); }
         )
     {return param;}
 }
@@ -3881,6 +3884,22 @@ AlterExpression AlterExpression():
         )
     )
     |
+    (<K_CHANGE>
+      {
+        alterExp.setOperation(AlterOperation.CHANGE);
+      }
+      (
+        <K_COLUMN> { alterExp.setOptionalSpecifier("COLUMN"); } | {}
+      )
+      (
+        (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>)
+        alterExpressionColumnDataType = AlterExpressionColumnDataType() {
+            alterExp.setColOldName(tk.image);
+            alterExp.addColDataType(alterExpressionColumnDataType);
+        }
+      )
+    )
+    |
     (<K_DROP>
       {
             alterExp.setOperation(AlterOperation.DROP);
diff --git a/src/test/java/net/sf/jsqlparser/parser/CCJSqlParserUtilTest.java b/src/test/java/net/sf/jsqlparser/parser/CCJSqlParserUtilTest.java
@@ -128,4 +128,17 @@ public void testParseStatementsIssue691_2() throws Exception {
                 + "---test");
         assertEquals("SELECT * FROM dual;\n", result.toString());
     }
+
+    @Test
+    public void testParseStatementIssue742() throws Exception {
+        Statements result = CCJSqlParserUtil.parseStatements("CREATE TABLE `table_name` (\n" +
+                "  `id` bigint(20) NOT NULL AUTO_INCREMENT,\n" +
+                "  `another_column_id` bigint(20) NOT NULL COMMENT 'column id as sent by SYSTEM',\n" +
+                "  PRIMARY KEY (`id`),\n" +
+                "  UNIQUE KEY `uk_another_column_id` (`another_column_id`)\n" +
+                ")");
+        assertEquals("CREATE TABLE `table_name` (`id` bigint (20) NOT NULL AUTO_INCREMENT, `another_column_id` " +
+                "bigint (20) NOT NULL COMMENT 'column id as sent by SYSTEM', PRIMARY KEY (`id`), UNIQUE KEY `uk_another_column_id` " +
+                "(`another_column_id`));\n", result.toString());
+    }
 }
diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java
@@ -262,6 +262,34 @@ public void testAlterTableAlterColumn() throws JSQLParserException {
       assertSqlCanBeParsedAndDeparsed("ALTER TABLE table_name ALTER COLUMN column_name_1 TYPE TIMESTAMP, ALTER COLUMN column_name_2 TYPE BOOLEAN");
     }
 
+    @Test
+    public void testAlterTableChangeColumn1() throws JSQLParserException {
+        Statement stmt = CCJSqlParserUtil.parse("ALTER TABLE tb_test CHANGE COLUMN c1 c2 INT (10)");
+        Alter alter = (Alter) stmt;
+        assertEquals(AlterOperation.CHANGE, alter.getAlterExpressions().get(0).getOperation());
+        assertEquals("c1", alter.getAlterExpressions().get(0).getColOldName());
+        assertEquals("COLUMN", alter.getAlterExpressions().get(0).getOptionalSpecifier());
+    }
+
+    @Test
+    public void testAlterTableChangeColumn2() throws JSQLParserException {
+        Statement stmt = CCJSqlParserUtil.parse("ALTER TABLE tb_test CHANGE c1 c2 INT (10)");
+        Alter alter = (Alter) stmt;
+        assertEquals(AlterOperation.CHANGE, alter.getAlterExpressions().get(0).getOperation());
+        assertEquals("c1", alter.getAlterExpressions().get(0).getColOldName());
+        assertNull(alter.getAlterExpressions().get(0).getOptionalSpecifier());
+    }
+
+    @Test
+    public void testAlterTableChangeColumn3() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("ALTER TABLE tb_test CHANGE COLUMN c1 c2 INT (10)");
+    }
+
+    @Test
+    public void testAlterTableChangeColumn4() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("ALTER TABLE tb_test CHANGE c1 c2 INT (10)");
+    }
+
     @Test
     public void testAlterTableAddColumnWithZone() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE mytable ADD COLUMN col1 timestamp with time zone");

Original file line number	Diff line number	Diff line change
`@@ -51,19 +51,18 @@ public Table() {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public Table(String name) {`
`54`		`- setIndex(NAME_IDX, name);`
	`54`	`+ setName(name);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public Table(String schemaName, String name) {`
`58`		`- setIndex(NAME_IDX, name);`
`59`		`- setIndex(SCHEMA_IDX, schemaName);`
	`58`	`+ setName(name);`
	`59`	`+ setSchemaName(schemaName);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public Table(Database database, String schemaName, String name) {`
`63`		`- setIndex(NAME_IDX, name);`
`64`		`- setIndex(SCHEMA_IDX, schemaName);`
`65`		`- setIndex(DATABASE_IDX, database.getDatabaseName());`
`66`		`- setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());`
	`63`	`+ setName(name);`
	`64`	`+ setSchemaName(schemaName);`
	`65`	`+ setDatabase(database);`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`public Table(List<String> partItems) {`
`@@ -77,6 +76,7 @@ public Database getDatabase() {`
`77`	`76`
`78`	`77`	`public void setDatabase(Database database) {`
`79`	`78`	`setIndex(DATABASE_IDX, database.getDatabaseName());`
	`79`	`+ setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public String getSchemaName() {`
`@@ -173,3 +173,4 @@ public String toString() {`
`173`	`173`	`+ ((hint != null) ? hint.toString() : "");`
`174`	`174`	`}`
`175`	`175`	`}`
	`176`	`+`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */`
`158`	`158`	`\| <K_CASE:"CASE">`
`159`	`159`	`\| <K_CAST:"CAST">`
`160`	`160`	`\| <K_CHARACTER:"CHARACTER">`
	`161`	`+\| <K_CHANGE:"CHANGE">`
`161`	`162`	`\| <K_CHECK:"CHECK">`
`162`	`163`	`\| <K_CHAR:"CHAR">`
`163`	`164`	`\| <K_COLUMN:"COLUMN">`
`@@ -3601,6 +3602,8 @@ List<String> CreateParameter():`
`3601`	`3602`	`tk=<K_IN> { param.add(tk.image); }`
`3602`	`3603`	`\|`
`3603`	`3604`	`tk=<K_TYPE> { param.add(tk.image); }`
	`3605`	`+ \|`
	`3606`	`+ tk=<K_COMMENT> { param.add(tk.image); }`
`3604`	`3607`	`)`
`3605`	`3608`	`{return param;}`
`3606`	`3609`	`}`
`@@ -3881,6 +3884,22 @@ AlterExpression AlterExpression():`
`3881`	`3884`	`)`
`3882`	`3885`	`)`
`3883`	`3886`	`\|`
	`3887`	`+ (<K_CHANGE>`
	`3888`	`+ {`
	`3889`	`+ alterExp.setOperation(AlterOperation.CHANGE);`
	`3890`	`+ }`
	`3891`	`+ (`
	`3892`	`+ <K_COLUMN> { alterExp.setOptionalSpecifier("COLUMN"); } \| {}`
	`3893`	`+ )`
	`3894`	`+ (`
	`3895`	`+ (tk=<S_IDENTIFIER> \| tk=<S_QUOTED_IDENTIFIER>)`
	`3896`	`+ alterExpressionColumnDataType = AlterExpressionColumnDataType() {`
	`3897`	`+ alterExp.setColOldName(tk.image);`
	`3898`	`+ alterExp.addColDataType(alterExpressionColumnDataType);`
	`3899`	`+ }`
	`3900`	`+ )`
	`3901`	`+ )`
	`3902`	`+ \|`
`3884`	`3903`	`(<K_DROP>`
`3885`	`3904`	`{`
`3886`	`3905`	`alterExp.setOperation(AlterOperation.DROP);`