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

ddl, planner: support ALTER TABLE without use db #18784

Merged
merged 15 commits into from
Aug 26, 2020
Merged

ddl, planner: support ALTER TABLE without use db #18784

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0429778
ddl, planner: support `ALTER TABLE` without use db
xhebox Jul 25, 2020
c9ddd3a
ddl,planner: only effect foreign key reference
xhebox Aug 4, 2020
46b6aa4
Merge branch 'master' into 18756
AilinKid Aug 20, 2020
c407473
Merge branch 'master' into 18756
AilinKid Aug 20, 2020
b0a31dd
ddl: merge condition
xhebox Aug 20, 2020
1489867
ddl: fix
xhebox Aug 20, 2020
5d33e8d
planner: refactor the test
xhebox Aug 25, 2020
d743364
planner: format error
xhebox Aug 25, 2020
e3f81f7
planner: address comment
xhebox Aug 25, 2020
4a4f928
planner: fix
xhebox Aug 25, 2020
0b1ca55
planner: fix test
xhebox Aug 26, 2020
9b8f9f4
planner: fix
xhebox Aug 26, 2020
40839e7
planner: improve test
xhebox Aug 26, 2020
e67398f
Merge branch 'master' into 18756
ti-srebot Aug 26, 2020
16876d8
Merge branch 'master' into 18756
ti-srebot Aug 26, 2020
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
7 changes: 7 additions & 0 deletions planner/core/preprocess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,13 @@ func (p *preprocessor) resolveAlterTableStmt(node *ast.AlterTableStmt) {
if spec.Tp == ast.AlterTableRenameTable {
p.flag |= inCreateOrDropTable
break
xhebox marked this conversation as resolved.
Show resolved Hide resolved
} else if spec.Tp == ast.AlterTableAddConstraint {
xhebox marked this conversation as resolved.
Show resolved Hide resolved
if spec.Constraint.Refer != nil {
xhebox marked this conversation as resolved.
Show resolved Hide resolved
table := spec.Constraint.Refer.Table
if table.Schema.L == "" && node.Table.Schema.L != "" {
table.Schema = model.NewCIStr(node.Table.Schema.L)
}
}
}
}
}
Expand Down
12 changes: 9 additions & 3 deletions planner/core/preprocess_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ func (s *testValidatorSuite) TestValidator(c *C) {
inPrepare bool
err error
}{
// issue 18756
{"ALTER TABLE test.t ADD CONSTRAINT fk FOREIGN KEY (c2) REFERENCES t (c1)", false, nil},

{"select ?", false, parser.ErrSyntax},
{"select ?", true, nil},
{"create table t(id int not null auto_increment default 2, key (id))", true,
Expand Down Expand Up @@ -228,11 +231,14 @@ func (s *testValidatorSuite) TestValidator(c *C) {
}()
se, err := session.CreateSession4Test(store)
c.Assert(err, IsNil)
_, err = se.Execute(context.Background(), "use test")
c.Assert(err, IsNil)
ctx := se.(sessionctx.Context)
is := infoschema.MockInfoSchema([]*model.TableInfo{core.MockSignedTable()})
for _, tt := range tests {
for k, tt := range tests {
// the first test should be executed without selecting a database
if k == 1 {
_, err = se.Execute(context.Background(), "use test")
c.Assert(err, IsNil)
}
xhebox marked this conversation as resolved.
Show resolved Hide resolved
stmts, err1 := session.Parse(ctx, tt.sql)
c.Assert(err1, IsNil)
c.Assert(stmts, HasLen, 1)
Expand Down