Skip to content

parser: fix compatibility for OnDelete,OnUpdate clauses #393

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
kennytm merged 6 commits into from
Jul 25, 2019
Merged

parser: fix compatibility for OnDelete,OnUpdate clauses #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83b74bd
fix
Jul 18, 2019
cfc48e7
fix check for ColumnOption
Jul 19, 2019
cb94e5e
add test for match
Jul 19, 2019
096f1c1
merge master
Jul 22, 2019
dc0e944
Merge remote-tracking branch 'upstream/master' into fix_alter_table_a…
Jul 25, 2019
a822211
use array
Jul 25, 2019
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
26 changes: 26 additions & 0 deletions ast/ddl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,17 @@ func (n *IndexColName) Accept(v Visitor) (Node, bool) {
return v.Leave(n)
}

// MatchType is the type for reference match type.
type MatchType int

// match type
const (
MatchNone MatchType = iota
MatchFull
MatchPartial
MatchSimple
)

// ReferenceDef is used for parsing foreign key reference option from SQL.
// See http://dev.mysql.com/doc/refman/5.7/en/create-table-foreign-keys.html
type ReferenceDef struct {
Expand All @@ -231,6 +242,7 @@ type ReferenceDef struct {
IndexColNames []*IndexColName
OnDelete *OnDeleteOpt
OnUpdate *OnUpdateOpt
Match MatchType
}

// Restore implements Node interface.
Expand All @@ -251,6 +263,17 @@ func (n *ReferenceDef) Restore(ctx *RestoreCtx) error {
}
}
ctx.WritePlain(")")
if n.Match != MatchNone {
ctx.WriteKeyWord(" MATCH ")
switch n.Match {
case MatchFull:
ctx.WriteKeyWord("FULL")
case MatchPartial:
ctx.WriteKeyWord("PARTIAL")
case MatchSimple:
ctx.WriteKeyWord("SIMPLE")
}
}
if n.OnDelete.ReferOpt != ReferOptionNoOption {
ctx.WritePlain(" ")
if err := n.OnDelete.Restore(ctx); err != nil {
Expand Down Expand Up @@ -308,6 +331,7 @@ const (
ReferOptionCascade
ReferOptionSetNull
ReferOptionNoAction
ReferOptionSetDefault
)

// String implements fmt.Stringer interface.
Expand All @@ -321,6 +345,8 @@ func (r ReferOptionType) String() string {
return "SET NULL"
case ReferOptionNoAction:
return "NO ACTION"
case ReferOptionSetDefault:
return "SET DEFAULT"
}
return ""
}
Expand Down
3 changes: 3 additions & 0 deletions misc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ var tokenMap = map[string]int{
"LONGTEXT": longtextType,
"LOW_PRIORITY": lowPriority,
"MASTER": master,
"MATCH": match,
"MAX": max,
"MAX_CONNECTIONS_PER_HOUR": maxConnectionsPerHour,
"MAX_EXECUTION_TIME": maxExecutionTime,
Expand Down Expand Up @@ -405,6 +406,7 @@ var tokenMap = map[string]int{
"OUTER": outer,
"PACK_KEYS": packKeys,
"PAGE": pageSym,
"PARTIAL": partial,
"PARTITION": partition,
"PARTITIONS": partitions,
"PASSWORD": password,
Expand Down Expand Up @@ -470,6 +472,7 @@ var tokenMap = map[string]int{
"SHARED": shared,
"SHOW": show,
"SIGNED": signed,
"SIMPLE": simple,
"SLAVE": slave,
"SLOW": slow,
"SMALLINT": smallIntType,
Expand Down
Loading