Skip to content

Add if not exists support to database ddl in parsing #6724

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

Merged
harshit-gangal merged 4 commits into from
Sep 18, 2020
Merged

Add if not exists support to database ddl in parsing #6724

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be3b8fb
add if not exists in create db support
harshit-gangal Sep 15, 2020
00d32c1
added parser test
harshit-gangal Sep 15, 2020
fb29f7f
use bool for ifexists and ifnotexists
harshit-gangal Sep 17, 2020
7950eca
Use bool instead of BoolVal
systay Sep 18, 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
19 changes: 13 additions & 6 deletions go/vt/sqlparser/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,12 @@ type (

// DBDDL represents a CREATE, DROP, or ALTER database statement.
DBDDL struct {
Action string
DBName string
IfExists bool
Collate string
Charset string
Action string
DBName string
IfExists bool
IfNotExists bool
Collate string
Charset string
}

// DDL represents a CREATE, ALTER, DROP, RENAME, TRUNCATE or ANALYZE statement.
Expand Down Expand Up @@ -991,7 +992,13 @@ func (node *SetTransaction) Format(buf *TrackedBuffer) {
// Format formats the node.
func (node *DBDDL) Format(buf *TrackedBuffer) {
switch node.Action {
case CreateStr, AlterStr:
case CreateStr:
notExists := ""
if node.IfNotExists {
notExists = " if not exists"
}
buf.WriteString(fmt.Sprintf("%s database%s %v", node.Action, notExists, node.DBName))
case AlterStr:
buf.WriteString(fmt.Sprintf("%s database %s", node.Action, node.DBName))
case DropStr:
exists := ""
Expand Down
9 changes: 5 additions & 4 deletions go/vt/sqlparser/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,16 +1610,17 @@ var (
input: "create schema test_db",
output: "create database test_db",
}, {
input: "create database if not exists test_db",
output: "create database test_db",
input: "create database if not exists test_db",
}, {
input: "create schema if not exists test_db",
output: "create database if not exists test_db",
}, {
input: "drop database test_db",
}, {
input: "drop schema test_db",
output: "drop database test_db",
}, {
input: "drop database if exists test_db",
output: "drop database test_db",
input: "drop database if exists test_db",
}, {
input: "delete a.*, b.* from tbl_a a, tbl_b b where a.id = b.id and b.name = 'test'",
output: "delete a, b from tbl_a as a, tbl_b as b where a.id = b.id and b.name = 'test'",
Expand Down
Loading