From 50e8abca2c016a48bc5370c772e6fc91393f9d77 Mon Sep 17 00:00:00 2001
From: JingShang Lu <jingshanglu1@gmail.com>
Date: Fri, 3 Jul 2020 21:01:14 +0800
Subject: [PATCH] fix rewrite for subquery in from (#6259)

---
 .../src/test/resources/sharding/select.xml                | 5 +++++
 .../binder/statement/dml/SelectStatementContext.java      | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/sharding/select.xml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/sharding/select.xml
index 125b52cca9..9c5f4cc433 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/sharding/select.xml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/sharding/select.xml
@@ -26,6 +26,11 @@
         <input sql="SELECT * FROM t_account WHERE account_id = 100" />
         <output sql="SELECT * FROM t_account_0 WHERE account_id = 100" />
     </rewrite-assertion>
+
+    <rewrite-assertion id="select_with_subquery" db-type="MySQL">
+        <input sql="SELECT * FROM (select * from t_account where account_id=?) a WHERE account_id = 100" />
+        <output sql="SELECT * FROM (select * from t_account_0 where account_id=?) a WHERE account_id = 100" />
+    </rewrite-assertion>
     
     <rewrite-assertion id="select_without_sharding_value_for_parameters">
         <input sql="SELECT * FROM db.t_account WHERE amount = ?" parameters="1000" />
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/statement/dml/SelectStatementContext.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/statement/dml/SelectStatementContext.java
index 3efee0c9e8..09353e702a 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/statement/dml/SelectStatementContext.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/statement/dml/SelectStatementContext.java
@@ -56,6 +56,7 @@ import org.apache.shardingsphere.sql.parser.sql.segment.dml.predicate.WhereSegme
 import org.apache.shardingsphere.sql.parser.sql.segment.generic.OwnerAvailable;
 import org.apache.shardingsphere.sql.parser.sql.segment.generic.OwnerSegment;
 import org.apache.shardingsphere.sql.parser.sql.segment.generic.table.SimpleTableSegment;
+import org.apache.shardingsphere.sql.parser.sql.segment.generic.table.SubqueryTableSegment;
 import org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement;
 import org.apache.shardingsphere.sql.parser.sql.util.SQLUtil;
 
@@ -311,6 +312,13 @@ public final class SelectStatementContext extends CommonSQLStatementContext<Sele
         if (null != tableFactorSegment.getTable() && tableFactorSegment.getTable() instanceof SimpleTableSegment) {
             result.add((SimpleTableSegment) tableFactorSegment.getTable());
         }
+        // TODO subquery in from support not use alias
+        if (null != tableFactorSegment.getTable() && tableFactorSegment.getTable() instanceof SubqueryTableSegment) {
+            SelectStatement subselect = ((SubqueryTableSegment) tableFactorSegment.getTable()).getSubquery().getSelect();
+            for (TableReferenceSegment each : subselect.getTableReferences()) {
+                result.addAll(getTablesFromTableReference(each));
+            }
+        }
         if (null != tableFactorSegment.getTableReferences() && !tableFactorSegment.getTableReferences().isEmpty()) {
             for (TableReferenceSegment each: tableFactorSegment.getTableReferences()) {
                 result.addAll(getTablesFromTableReference(each));
-- 
GitLab