for #2084, sql-statement-rule-definition.xml extractor-rule-refs.tabl…

…eNames => extractor-rule-refs.tableName
apache · Apr 8, 2019 · 77d03c2 · 77d03c2
1 parent 3f46ffb
commit 77d03c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...ava/org/apache/shardingsphere/core/parse/antlr/filler/common/dml/InsertColumnsFiller.java b/...ava/org/apache/shardingsphere/core/parse/antlr/filler/common/dml/InsertColumnsFiller.java
@@ -42,15 +42,15 @@ public void fill(final InsertColumnsSegment sqlSegment, final SQLStatement sqlSt
         if (sqlStatement instanceof InsertStatement) {
             InsertStatement insertStatement = (InsertStatement) sqlStatement;
             if (sqlSegment.getColumns().isEmpty()) {
-                fillFromMetaData(insertStatement, shardingTableMetaData);
+                fill(insertStatement, shardingTableMetaData);
             } else {
-                fillFromSegment(sqlSegment, insertStatement);
+                fill(sqlSegment, insertStatement);
             }
             insertStatement.getSQLTokens().add(new InsertValuesToken(sqlSegment.getStartIndex(), DefaultKeyword.VALUES));
         }
     }
 
-    private void fillFromMetaData(final InsertStatement insertStatement, final ShardingTableMetaData shardingTableMetaData) {
+    private void fill(final InsertStatement insertStatement, final ShardingTableMetaData shardingTableMetaData) {
         String tableName = insertStatement.getTables().getSingleTableName();
         if (shardingTableMetaData.containsTable(tableName)) {
             for (String each : shardingTableMetaData.getAllColumnNames(tableName)) {
@@ -60,7 +60,7 @@ private void fillFromMetaData(final InsertStatement insertStatement, final Shard
         }
     }
 
-    private void fillFromSegment(final InsertColumnsSegment sqlSegment, final InsertStatement insertStatement) {
+    private void fill(final InsertColumnsSegment sqlSegment, final InsertStatement insertStatement) {
         String tableName = insertStatement.getTables().getSingleTableName();
         for (ColumnSegment each : sqlSegment.getColumns()) {
             insertStatement.getColumns().add(new Column(each.getName(), tableName));

diff --git a/...sources/META-INF/parsing-rule-definition/sharding/mysql/sql-statement-rule-definition.xml b/...sources/META-INF/parsing-rule-definition/sharding/mysql/sql-statement-rule-definition.xml
@@ -26,7 +26,8 @@
     <sql-statement-rule context="createIndex" sql-statement-class="org.apache.shardingsphere.core.parse.antlr.sql.statement.ddl.DDLStatement" extractor-rule-refs="tableName, indexName" />
     <sql-statement-rule context="dropIndex" sql-statement-class="org.apache.shardingsphere.core.parse.antlr.sql.statement.ddl.DDLStatement" extractor-rule-refs="tableName, indexName" />
 
-    <sql-statement-rule context="insert" sql-statement-class="org.apache.shardingsphere.core.parse.antlr.sql.statement.dml.InsertStatement" extractor-rule-refs="tableNames, insertColumns, insertValues, setAssignments, onDuplicateKeyColumns"/>
+    <sql-statement-rule context="insert" sql-statement-class="org.apache.shardingsphere.core.parse.antlr.sql.statement.dml.InsertStatement" 
+                        extractor-rule-refs="tableName, insertColumns, insertValues, setAssignments, onDuplicateKeyColumns"/>
     <sql-statement-rule context="update" sql-statement-class="org.apache.shardingsphere.core.parse.antlr.sql.statement.dml.DMLStatement" extractor-rule-refs="tableNames, updateWhere"/>
     <sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.core.parse.antlr.sql.statement.dml.DMLStatement" extractor-rule-refs="tableNames, deleteFromWhere"/>
     <sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.core.parse.antlr.sql.statement.dml.SelectStatement"