Merge pull request #3109 from huajianxiaowanzi/liulonghui

fix: enable the subquery function to recognize subqueries in the FROM clause

Author: winfredLIN

sqle/driver/mysql/rule/ai/util/extractor.go

@@ -158,12 +158,23 @@ type SubqueryExprExtractor struct {
 	expr []*ast.SubqueryExpr
 }
 
-func (te *SubqueryExprExtractor) Enter(in ast.Node) (node ast.Node, skipChildren bool) {
-	e, ok := in.(*ast.SubqueryExpr)
-	if !ok {
+func (te *SubqueryExprExtractor) Enter(in ast.Node) (ast.Node, bool) {
+	// 情况 1: WHERE、IN、EXISTS 中的子查询
+	if sub, ok := in.(*ast.SubqueryExpr); ok {
+		te.expr = append(te.expr, sub)
 		return in, false
 	}
-	te.expr = append(te.expr, e)
+
+	// 情况 2: FROM 中的子查询（即 SelectStmt 嵌套在 TableSource 中）
+	if ts, ok := in.(*ast.TableSource); ok {
+		if sel, ok := ts.Source.(*ast.SelectStmt); ok {
+			// 包装成 SubqueryExpr 形式以便统一处理
+			te.expr = append(te.expr, &ast.SubqueryExpr{
+				Query: sel,
+			})
+		}
+	}
+
 	return in, false
 }
 

sqle/driver/mysql/rule_00108_test.go

@@ -72,15 +72,15 @@ func TestRuleSQLE00108(t *testing.T) {
 		nil, newTestResult())
 
 	// 这个子查询中实际扫描表的子查询 只有1个，因此不算违规
-	runAIRuleCase(rule, t, "case 15: SELECT语句中使用JOIN的ON条件中嵌套子查询5层, 但是实际扫描表的子查询只有1次，因此不算违规",
+	runAIRuleCase(rule, t, "case 15: SELECT语句中使用JOIN的ON条件中嵌套子查询5层",
 		"SELECT st1.id FROM st1 JOIN st_class ON st1.cid in (SELECT cid FROM (SELECT cid FROM (SELECT cid FROM (SELECT cid FROM (SELECT cid FROM st_class WHERE cname = 'class2') AS sub1) AS sub2) AS sub3) AS sub4);",
 		session.NewAIMockContext().WithSQL("CREATE TABLE st1 (id INT, cid INT); CREATE TABLE st_class (cid INT, cname VARCHAR(50));"),
 		nil, newTestResult())
 
-	runAIRuleCase(rule, t, "case 16: SELECT语句中使用JOIN的ON条件中嵌套子查询6层, 但是实际扫描表的子查询只有2次，因此不算违规",
+	runAIRuleCase(rule, t, "case 16: SELECT语句中使用JOIN的ON条件中嵌套子查询6层, 违规",
 		"SELECT st1.id FROM st1 JOIN st_class ON st1.cid in (SELECT cid FROM (SELECT cid FROM (SELECT cid FROM (SELECT cid FROM (SELECT cid FROM st_class WHERE cname in (SELECT cname FROM st_class WHERE cname = 'class2')) AS sub1) AS sub2) AS sub3) AS sub4);",
 		session.NewAIMockContext().WithSQL("CREATE TABLE st1 (id INT, cid INT); CREATE TABLE st_class (cid INT, cname VARCHAR(50));"),
-		nil, newTestResult())
+		nil, newTestResult().addResult(ruleName))
 
 	runAIRuleCase(rule, t, "case 17: SELECT语句中 查询列中, 嵌套子查询2层",
 		"SELECT 1, st1.id, (SELECT (SELECT id0 FROM exist_db.exist_tb_1 WHERE id1 = 'value') xx2 FROM exist_db.exist_tb_1 WHERE id1 = 'value') xxx FROM st1;",

sqle/driver/mysql/rule_00109_test.go

@@ -71,12 +71,11 @@ func TestRuleSQLE00109(t *testing.T) {
 			WithSQL("CREATE TABLE orders_archive (id INT, amount DECIMAL(10,2));"),
 		nil, newTestResult())
 
-	// 特殊情况：解析器好像对from中嵌套的子查询 ，会被视作为属于非实际路由的子查询，因此没有累计（相当于只是个外壳嵌套而已，因此这里可以视作为不违规
-	runAIRuleCase(rule, t, "case 9: SELECT ... UNION ALL SELECT语句中的子查询使用LIMIT，但是这里子查询其实是可以直接push到外层的，可以不算做子查询",
+	runAIRuleCase(rule, t, "case 9: SELECT ... UNION ALL SELECT语句中的子查询使用LIMIT",
 		"SELECT * FROM (SELECT id FROM products LIMIT 1) AS sub UNION ALL SELECT * FROM products;",
 		session.NewAIMockContext().
 			WithSQL("CREATE TABLE products (id INT, name VARCHAR(100));"),
-		nil, newTestResult())
+		nil, newTestResult().addResult(ruleName))
 
 	runAIRuleCase(rule, t, "case 10: SELECT ... UNION ALL SELECT语句中的子查询不使用LIMIT",
 		"SELECT * FROM (SELECT id FROM products) AS sub UNION ALL SELECT * FROM products;",