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

execute: set TableAsName and ColumnAsName for prepared statement #5776

Merged
merged 1 commit into from
Feb 2, 2018
Merged

execute: set TableAsName and ColumnAsName for prepared statement #5776

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
8 changes: 8 additions & 0 deletions executor/prepared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@ func (e *PrepareExec) DoPrepare() {
}
if result, ok := stmt.(ast.ResultSetNode); ok {
e.Fields = result.GetResultFields()
for _, fields := range e.Fields {
if fields.TableAsName.O == "" {
fields.TableAsName = fields.Table.Name
}
if fields.ColumnAsName.O == "" {
fields.ColumnAsName = fields.Column.Name
}
}
}

// The parameter markers are appended in visiting order, which may not
Expand Down
31 changes: 31 additions & 0 deletions executor/prepared_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,37 @@ func (s *testSuite) TestPrepared(c *C) {
_, err = tk.Exec("execute stmt")
c.Assert(err, NotNil)

_, _, fields, err := tk.Se.PrepareStmt("select a from prepare3")
c.Assert(err, IsNil)
c.Assert(fields[0].DBName.L, Equals, "test")
c.Assert(fields[0].TableAsName.L, Equals, "prepare3")
c.Assert(fields[0].ColumnAsName.L, Equals, "a")

_, _, fields, err = tk.Se.PrepareStmt("select a from prepare3 where ?")
c.Assert(err, IsNil)
c.Assert(fields[0].DBName.L, Equals, "test")
c.Assert(fields[0].TableAsName.L, Equals, "prepare3")
c.Assert(fields[0].ColumnAsName.L, Equals, "a")

_, _, fields, err = tk.Se.PrepareStmt("select (1,1) in (select 1,1)")
c.Assert(err, IsNil)
c.Assert(fields[0].DBName.L, Equals, "")
c.Assert(fields[0].TableAsName.L, Equals, "")
c.Assert(fields[0].ColumnAsName.L, Equals, "(1,1) in (select 1,1)")

_, _, fields, err = tk.Se.PrepareStmt("select * from prepare3 as t1 join prepare3 as t2")
c.Assert(err, IsNil)
c.Assert(fields[0].DBName.L, Equals, "test")
c.Assert(fields[0].TableAsName.L, Equals, "t1")
c.Assert(fields[0].ColumnAsName.L, Equals, "a")
c.Assert(fields[1].DBName.L, Equals, "test")
c.Assert(fields[1].TableAsName.L, Equals, "t2")
c.Assert(fields[1].ColumnAsName.L, Equals, "a")

_, _, fields, err = tk.Se.PrepareStmt("update prepare3 set a = ?")
c.Assert(err, IsNil)
c.Assert(len(fields), Equals, 0)

// Coverage.
exec := &executor.ExecuteExec{}
exec.Next()
Expand Down