Merge 67a64bc into ce4147b

apache · Apr 6, 2020 · 6906d3f · 6906d3f
2 parents ce4147b + 67a64bc
commit 6906d3f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/...rc/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDMLVisitor.java b/...rc/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDMLVisitor.java
@@ -208,7 +208,7 @@ public ASTNode visitUpdate(final UpdateContext ctx) {
         UpdateStatement result = new UpdateStatement();
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getTables().addAll(each.getTables());
+            result.getTables().addAll(each.getSimpleTableSegments());
         }
         result.setSetAssignment((SetAssignmentSegment) visit(ctx.setAssignmentsClause()));
         if (null != ctx.whereClause()) {
@@ -289,7 +289,7 @@ public ASTNode visitMultipleTablesClause(final MultipleTablesClauseContext ctx)
         result.combine((CollectionValue<SimpleTableSegment>) visit(ctx.multipleTableNames()));
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getValue().addAll(each.getTables());
+            result.getValue().addAll(each.getSimpleTableSegments());
         }
         return result;
     }

diff --git a/.../main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDMLVisitor.java b/.../main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDMLVisitor.java
@@ -144,7 +144,7 @@ public ASTNode visitUpdate(final UpdateContext ctx) {
         UpdateStatement result = new UpdateStatement();
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getTables().addAll(each.getTables());
+            result.getTables().addAll(each.getSimpleTableSegments());
         }
         result.setSetAssignment((SetAssignmentSegment) visit(ctx.setAssignmentsClause()));
         if (null != ctx.whereClause()) {
@@ -220,7 +220,7 @@ public ASTNode visitMultipleTablesClause(final MultipleTablesClauseContext ctx)
         result.combine((CollectionValue<SimpleTableSegment>) visit(ctx.multipleTableNames()));
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getValue().addAll(each.getTables());
+            result.getValue().addAll(each.getSimpleTableSegments());
         }
         return result;
     }

diff --git a/...va/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java b/...va/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
@@ -150,7 +150,7 @@ public ASTNode visitUpdate(final UpdateContext ctx) {
         UpdateStatement result = new UpdateStatement();
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getTables().addAll(each.getTables());
+            result.getTables().addAll(each.getSimpleTableSegments());
         }
         result.setSetAssignment((SetAssignmentSegment) visit(ctx.setAssignmentsClause()));
         if (null != ctx.whereClause()) {
@@ -225,7 +225,7 @@ public ASTNode visitMultipleTablesClause(final MultipleTablesClauseContext ctx)
         CollectionValue<SimpleTableSegment> result = new CollectionValue<>();
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getValue().addAll(each.getTables());
+            result.getValue().addAll(each.getSimpleTableSegments());
         }
         return result;
     }

diff --git a/...rc/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/impl/SQL92DMLVisitor.java b/...rc/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/impl/SQL92DMLVisitor.java
@@ -138,7 +138,7 @@ public ASTNode visitUpdate(final UpdateContext ctx) {
         UpdateStatement result = new UpdateStatement();
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getTables().addAll(each.getTables());
+            result.getTables().addAll(each.getSimpleTableSegments());
         }
         result.setSetAssignment((SetAssignmentSegment) visit(ctx.setAssignmentsClause()));
         if (null != ctx.whereClause()) {

diff --git a/...java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDMLVisitor.java b/...java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDMLVisitor.java
@@ -139,7 +139,7 @@ public ASTNode visitUpdate(final UpdateContext ctx) {
         UpdateStatement result = new UpdateStatement();
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getTables().addAll(each.getTables());
+            result.getTables().addAll(each.getSimpleTableSegments());
         }
         result.setSetAssignment((SetAssignmentSegment) visit(ctx.setAssignmentsClause()));
         if (null != ctx.whereClause()) {
@@ -215,7 +215,7 @@ public ASTNode visitMultipleTablesClause(final MultipleTablesClauseContext ctx)
         result.combine((CollectionValue<SimpleTableSegment>) visit(ctx.multipleTableNames()));
         CollectionValue<TableReferenceSegment> tableReferences = (CollectionValue<TableReferenceSegment>) visit(ctx.tableReferences());
         for (TableReferenceSegment each : tableReferences.getValue()) {
-            result.getValue().addAll(each.getTables());
+            result.getValue().addAll(each.getSimpleTableSegments());
         }
         return result;
     }

diff --git a/...rc/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/TableFactorSegment.java b/...rc/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/TableFactorSegment.java
@@ -52,7 +52,7 @@ public Collection<SimpleTableSegment> getSimpleTableSegments() {
         }
         if (null != tableReferences && !tableReferences.isEmpty()) {
             for (TableReferenceSegment each: tableReferences) {
-                tables.addAll(each.getTables());
+                tables.addAll(each.getSimpleTableSegments());
             }
         }
         return tables;

diff --git a/...main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/TableReferenceSegment.java b/...main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/TableReferenceSegment.java
@@ -41,7 +41,7 @@ public final class TableReferenceSegment implements SQLSegment {
      *  get all tables.
      * @return Collection.
      */
-    public Collection<SimpleTableSegment> getTables() {
+    public Collection<SimpleTableSegment> getSimpleTableSegments() {
         Collection<SimpleTableSegment> tables = new LinkedList<>();
         if (null != tableFactor) {
             tables.addAll(tableFactor.getSimpleTableSegments());

diff --git a/...src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dml/SelectStatement.java b/...src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dml/SelectStatement.java
@@ -108,7 +108,7 @@ public Optional<LockSegment> getLock() {
     public Collection<SimpleTableSegment> getSimpleTableSegments() {
         Collection<SimpleTableSegment> result = new LinkedList<>();
         for (TableReferenceSegment each: tableReferences) {
-            result.addAll(each.getTables());
+            result.addAll(each.getSimpleTableSegments());
         }
         return result;
     }