Skip to content
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

planner/core: the order by with default field not parsed (#11210) #11668

Closed
wants to merge 1 commit into from
Closed

planner/core: the order by with default field not parsed (#11210) #11668

Show file tree
Hide file tree
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
16 changes: 16 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4846,3 +4846,19 @@ func (s *testIntegrationSuite) TestIssue11309And11319(c *C) {
tk.MustQuery(`SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 DAY_HOUR)`).Check(testkit.Rows("2007-03-31 00:08:28"))
tk.MustQuery(`SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 YEAR_MONTH)`).Check(testkit.Rows("2009-05-28 22:08:28"))
}

func (s *testIntegrationSuite) TestOrderbyWithDefaultFunc(c *C) {
defer s.cleanEnv(c)
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t")
tk.MustExec("create table t(a int default null, b int default null)")
tk.MustExec("insert into t values(1, 2), (3, 4)")
tk.MustQuery("select a from t order by default(a)").Check(testkit.Rows("1", "3"))
tk.MustQuery("select a from t order by default(b)").Check(testkit.Rows("1", "3"))
tk.MustQuery("select a, b from t order by default(a)").Check(testkit.Rows("1,2", "3,4"))
tk.MustQuery("select a from t order by length(b)").Check(testkit.Rows("1", "3"))
_, err := tk.Exec("select a, b from t order by default(c)")
c.Assert(err, NotNil)
c.Assert(terror.ErrorEqual(err, plannercore.ErrUnknownColumn.GenWithStackByArgs("c", "order clause")), IsTrue)
}
18 changes: 14 additions & 4 deletions planner/core/logical_plan_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,8 +1200,8 @@ func (a *havingWindowAndOrderbyExprResolver) Enter(n ast.Node) (node ast.Node, s
return n, false
}

func (a *havingWindowAndOrderbyExprResolver) resolveFromSchema(v *ast.ColumnNameExpr, schema *expression.Schema) (int, error) {
col, err := schema.FindColumn(v.Name)
func (a *havingWindowAndOrderbyExprResolver) resolveFromSchema(colName *ast.ColumnName, schema *expression.Schema) (int, error) {
col, err := schema.FindColumn(colName)
if err != nil {
return -1, err
}
Expand Down Expand Up @@ -1253,6 +1253,16 @@ func (a *havingWindowAndOrderbyExprResolver) Leave(n ast.Node) (node ast.Node, o
}
case *ast.WindowSpec:
a.inWindowSpec = false
case *ast.ColumnName:
index, err := a.resolveFromSchema(v, a.p.Schema())
if err != nil {
a.err = err
return node, false
}
if index == -1 {
a.err = ErrUnknownColumn.GenWithStackByArgs(v.OrigColName(), clauseMsg[a.curClause])
return node, false
}
case *ast.ColumnNameExpr:
resolveFieldsFirst := true
if a.inAggFunc || a.inWindowFunc || a.inWindowSpec || (a.orderBy && a.inExpr) {
Expand All @@ -1279,7 +1289,7 @@ func (a *havingWindowAndOrderbyExprResolver) Leave(n ast.Node) (node ast.Node, o
}
if index == -1 {
if a.orderBy {
index, a.err = a.resolveFromSchema(v, a.p.Schema())
index, a.err = a.resolveFromSchema(v.Name, a.p.Schema())
} else {
index, a.err = resolveFromSelectFields(v, a.selectFields, true)
}
Expand All @@ -1288,7 +1298,7 @@ func (a *havingWindowAndOrderbyExprResolver) Leave(n ast.Node) (node ast.Node, o
// We should ignore the err when resolving from schema. Because we could resolve successfully
// when considering select fields.
var err error
index, err = a.resolveFromSchema(v, a.p.Schema())
index, err = a.resolveFromSchema(v.Name, a.p.Schema())
_ = err
if index == -1 && a.curClause != windowClause {
index, a.err = resolveFromSelectFields(v, a.selectFields, false)
Expand Down