Skip to content

fix: 修复order by 表名没有被解析成对应分表的名称 #584 #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maskwang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: 修复order by 表名没有被解析成对应分表的名称 #584 #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions proxy/router/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,24 @@ func (r *Router) rewriteSelectSql(plan *Plan, node *sqlparser.Select, tableIndex
//rewrite where
oldright, err := plan.rewriteWhereIn(tableIndex)

//rewrite order
var restoreOrder map[*sqlparser.ColName][]byte
for _, v := range node.OrderBy {
colName, ok := v.Expr.(*sqlparser.ColName)
if !ok {
continue
}

if string(colName.Qualifier) == plan.Rule.Table {
if restoreOrder == nil {
restoreOrder = make(map[*sqlparser.ColName][]byte)
}
restoreOrder[colName] = colName.Qualifier

colName.Qualifier = []byte(fmt.Sprintf("%s_%04d", colName.Qualifier, tableIndex))
}
}

buf.Fprintf("%v%v%v%v%v%s",
node.Where,
node.GroupBy,
Expand All @@ -656,6 +674,12 @@ func (r *Router) rewriteSelectSql(plan *Plan, node *sqlparser.Select, tableIndex
if oldright != nil {
plan.InRightToReplace.Right = oldright
}
// restore order qualifier
if restoreOrder != nil {
for colName, qualifier := range restoreOrder {
colName.Qualifier = qualifier
}
}
return buf.String()
}

Expand Down