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

Jump to bottom

ddl: make TestDropLastVisibleColumns stable #24790

Merged
merged 6 commits into from
May 20, 2021
Merged

ddl: make TestDropLastVisibleColumns stable #24790

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b83e0bd
ddl: make `TestDropLastVisibleColumns` stable
zimulala May 20, 2021
f6e55f2
ddl: address comment
zimulala May 20, 2021
cf6c7d8
Merge branch 'master' into zimuxia/drop-visible-cols
ti-chi-bot May 20, 2021
d271a32
Merge branch 'master' into zimuxia/drop-visible-cols
zimulala May 20, 2021
b8d9420
Merge branch 'master' into zimuxia/drop-visible-cols
ti-chi-bot May 20, 2021
c368bf0
Merge branch 'master' into zimuxia/drop-visible-cols
bb7133 May 20, 2021
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
17 changes: 8 additions & 9 deletions ddl/db_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2614,24 +2614,23 @@ func (s *testIntegrationSuite5) TestDropColumnsWithMultiIndex(c *C) {
tk.MustQuery(query).Check(testkit.Rows())
}

func (s *testIntegrationSuite5) TestDropLastVisibleColumn(c *C) {
func (s *testIntegrationSuite5) TestDropLastVisibleColumnOrColumns(c *C) {
config.UpdateGlobal(func(conf *config.Config) {
conf.Experimental.AllowsExpressionIndex = true
zimulala marked this conversation as resolved.
Show resolved Hide resolved
})
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test_db")
tk.MustExec("create table t_drop_last_column(x int, key((1+1)))")
defer tk.MustExec("drop table if exists t_drop_last_column")
_, err := tk.Exec("alter table t_drop_last_column drop column x")
c.Assert(err, NotNil)
c.Assert(err.Error(), Equals, "[ddl:1113]A table must have at least 1 column")
}

func (s *testIntegrationSuite5) TestDropLastVisibleColumns(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test_db")
// for visible columns
tk.MustExec("create table t_drop_last_columns(x int, y int, key((1+1)))")
defer tk.MustExec("drop table if exists t_drop_last_columns")
_, err := tk.Exec("alter table t_drop_last_columns drop column x, drop column y")
_, err = tk.Exec("alter table t_drop_last_columns drop column x, drop column y")
c.Assert(err, NotNil)
c.Assert(err.Error(), Equals, "[ddl:1113]A table must have at least 1 column")

tk.MustExec("drop table if exists t_drop_last_column, t_drop_last_columns")
}

func (s *testIntegrationSuite7) TestAutoIncrementTableOption(c *C) {
Expand Down