Merge pull request #211 from XiaoMi/dev

修复分库分表 select xxx from tb as t force index(u_key) where t.id=x 语法错误
XiaoMi · Apr 6, 2022 · 22a72b9 · 22a72b9
2 parents 00036fb + 5a5fcb4
commit 22a72b9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/proxy/plan/decorator_table_name.go b/proxy/plan/decorator_table_name.go
@@ -28,6 +28,7 @@ type TableNameDecorator struct {
 	origin *ast.TableName
 	rule   router.Rule
 	result *RouteResult
+	Alias  string
 }
 
 // NeedCreateTableNameDecoratorWithoutAlias check if TableName without alias needs decorate
@@ -111,7 +112,10 @@ func (t *TableNameDecorator) Restore(ctx *format.RestoreCtx) error {
 	} else {
 		ctx.WriteName(fmt.Sprintf("%s_%04d", t.origin.Name.String(), tableIndex))
 	}
-
+	if t.Alias != "" {
+		ctx.WriteKeyWord(" AS ")
+		ctx.WriteName(t.Alias)
+	}
 	for _, value := range t.origin.IndexHints {
 		ctx.WritePlain(" ")
 		if err := value.Restore(ctx); err != nil {

diff --git a/proxy/plan/plan_select.go b/proxy/plan/plan_select.go
@@ -187,8 +187,7 @@ func HandleSelectStmt(p *SelectPlan, stmt *ast.SelectStmt) error {
 		return fmt.Errorf("handle Hint error: %v", err)
 	}
 
-
-//如果是多节点执行，特殊处理groupby orderby having limit
+	//如果是多节点执行，特殊处理groupby orderby having limit
 	if !p.isExecOnSingleNode() {
 		// group by的处理必须在table处理之后
 		if err := handleGroupBy(p, stmt); err != nil {
@@ -208,8 +207,6 @@ func HandleSelectStmt(p *SelectPlan, stmt *ast.SelectStmt) error {
 			p.columnCount = len(stmt.Fields.Fields)
 		}
 
-
-
 		if err := handleHaving(p, stmt); err != nil {
 			return fmt.Errorf("handle Having error: %v", err)
 		}
@@ -496,10 +493,13 @@ func rewriteTableNameInTableSource(p *TableAliasStmtInfo, tableSource *ast.Table
 
 	// 这是一个分片表或关联表, 创建一个TableName的装饰器, 并替换原有节点
 	d, err := CreateTableNameDecorator(tableName, rule, p.GetRouteResult())
+	d.Alias = tableSource.AsName.String()
 	if err != nil {
 		return fmt.Errorf("create TableNameDecorator error: %v", err)
 	}
 	tableSource.Source = d
+	tableSource.AsName.L = ""
+	tableSource.AsName.O = ""
 	return nil
 }
 

diff --git a/proxy/plan/plan_select_subquery.go b/proxy/plan/plan_select_subquery.go
@@ -51,7 +51,7 @@ func (s *SubqueryColumnNameRewriteVisitor) Leave(n ast.Node) (node ast.Node, ok
 	if rule == nil || rule.GetType() == router.GlobalTableRuleType {
 		return n, true
 	}
- 
+
 	decorator := CreateColumnNameExprDecorator(field, rule, false, s.info.GetRouteResult())
 	return decorator, true
 }
@@ -178,9 +178,12 @@ func rewriteSubqueryTableNameInTableSource(p *TableAliasStmtInfo, tableSource *a
 
 	// 这是一个分片表或关联表, 创建一个TableName的装饰器, 并替换原有节点
 	d, err := CreateTableNameDecorator(tableName, rule, p.GetRouteResult())
+	d.Alias = tableSource.AsName.String()
 	if err != nil {
 		return fmt.Errorf("create TableNameDecorator error: %v", err)
 	}
 	tableSource.Source = d
+	tableSource.AsName.L = ""
+	tableSource.AsName.O = ""
 	return nil
 }