Skip to content

S
soar

上島 / soar
与 Fork 源项目一致

Fork自 Xiaomi / soar

通知 1
Star 0
Fork 0
S
soar

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 6dcd3fc9 编写于 作者: martianzhang's avatar martianzhang
浏览文件
操作

pingcap/parser daily update

上级 59094bf3
隐藏空白更改
内联 并排
Showing with 49 addition and 40 deletion
vendor/github.com/pingcap/parser/ast/dml.go
浏览文件 @ 6dcd3fc9
...@@ -118,8 +118,8 @@ func (n *Join) Restore(ctx *RestoreCtx) error { ...@@ -118,8 +118,8 @@ func (n *Join) Restore(ctx *RestoreCtx) error {
ctx.JoinLevel-- ctx.JoinLevel--
if n.On != nil { if n.On != nil {
ctx.WriteKeyWord(" ON ") ctx.WritePlain(" ")
if err := n.On.Expr.Restore(ctx); err != nil { if err := n.On.Restore(ctx); err != nil {
return errors.Annotate(err, "An error occurred while restore Join.On") return errors.Annotate(err, "An error occurred while restore Join.On")
} }
} }
...@@ -325,7 +325,11 @@ type OnCondition struct { ...@@ -325,7 +325,11 @@ type OnCondition struct {
// Restore implements Node interface. // Restore implements Node interface.
func (n *OnCondition) Restore(ctx *RestoreCtx) error { func (n *OnCondition) Restore(ctx *RestoreCtx) error {
return errors.New("Not implemented") ctx.WriteKeyWord("ON ")
if err := n.Expr.Restore(ctx); err != nil {
return errors.Annotate(err, "An error occurred while restore OnCondition.Expr")
}
return nil
} }
// Accept implements Node Accept interface. // Accept implements Node Accept interface.
...@@ -551,7 +555,10 @@ type TableRefsClause struct { ...@@ -551,7 +555,10 @@ type TableRefsClause struct {
// Restore implements Node interface. // Restore implements Node interface.
func (n *TableRefsClause) Restore(ctx *RestoreCtx) error { func (n *TableRefsClause) Restore(ctx *RestoreCtx) error {
return errors.New("Not implemented") if err := n.TableRefs.Restore(ctx); err != nil {
return errors.Annotate(err, "An error occurred while restore TableRefsClause.TableRefs")
}
return nil
} }
// Accept implements Node Accept interface. // Accept implements Node Accept interface.
......
vendor/github.com/pingcap/parser/model/ddl.go
浏览文件 @ 6dcd3fc9
...@@ -53,6 +53,7 @@ const ( ...@@ -53,6 +53,7 @@ const (
ActionCreateView ActionType = 21 ActionCreateView ActionType = 21
ActionModifyTableCharsetAndCollate ActionType = 22 ActionModifyTableCharsetAndCollate ActionType = 22
ActionTruncateTablePartition ActionType = 23 ActionTruncateTablePartition ActionType = 23
ActionDropView ActionType = 24
) )
// AddIndexStr is a string related to the operation of "add index". // AddIndexStr is a string related to the operation of "add index".
...@@ -82,6 +83,7 @@ var actionMap = map[ActionType]string{ ...@@ -82,6 +83,7 @@ var actionMap = map[ActionType]string{
ActionCreateView: "create view", ActionCreateView: "create view",
ActionModifyTableCharsetAndCollate: "modify table charset and collate", ActionModifyTableCharsetAndCollate: "modify table charset and collate",
ActionTruncateTablePartition: "truncate partition", ActionTruncateTablePartition: "truncate partition",
ActionDropView: "drop view",
} }
// String return current ddl action in string // String return current ddl action in string
......
vendor/vendor.json
浏览文件 @ 6dcd3fc9
...@@ -113,104 +113,104 @@ ...@@ -113,104 +113,104 @@
{ {
"checksumSHA1": "KLFQyY05NrGhQCM+Lthp/X9/YcE=", "checksumSHA1": "KLFQyY05NrGhQCM+Lthp/X9/YcE=",
"path": "github.com/pingcap/parser", "path": "github.com/pingcap/parser",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "s7vZWQ/fyhgaPag6j8hQnZ3t3SY=", "checksumSHA1": "IkdWWfeUBw+gwiERRCMHYSBb8aA=",
"path": "github.com/pingcap/parser/ast", "path": "github.com/pingcap/parser/ast",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "skWGV4FNvD3vr+5olepaPPnylUw=", "checksumSHA1": "skWGV4FNvD3vr+5olepaPPnylUw=",
"path": "github.com/pingcap/parser/auth", "path": "github.com/pingcap/parser/auth",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "t4UHo966WzU9Z0IJkyGHRp0loOk=", "checksumSHA1": "t4UHo966WzU9Z0IJkyGHRp0loOk=",
"path": "github.com/pingcap/parser/charset", "path": "github.com/pingcap/parser/charset",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "SInoXbsRe0tnBwmatmtZYfSFbdk=", "checksumSHA1": "SInoXbsRe0tnBwmatmtZYfSFbdk=",
"path": "github.com/pingcap/parser/format", "path": "github.com/pingcap/parser/format",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "WZYTGDMnc1UfTdjdZoBbISsnpRY=", "checksumSHA1": "fMXmawvMELfwCuO/vrNtkUjQN/0=",
"path": "github.com/pingcap/parser/model", "path": "github.com/pingcap/parser/model",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "QBa9yiMDQNl2cLLwqlRoNTpCPNg=", "checksumSHA1": "QBa9yiMDQNl2cLLwqlRoNTpCPNg=",
"path": "github.com/pingcap/parser/mysql", "path": "github.com/pingcap/parser/mysql",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "mxpiJJ3b08I0o0Sd2rJLYMwz7uw=", "checksumSHA1": "mxpiJJ3b08I0o0Sd2rJLYMwz7uw=",
"path": "github.com/pingcap/parser/opcode", "path": "github.com/pingcap/parser/opcode",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "XvnUllvwMYd6HrMvMiKnn4cGN2M=", "checksumSHA1": "XvnUllvwMYd6HrMvMiKnn4cGN2M=",
"path": "github.com/pingcap/parser/terror", "path": "github.com/pingcap/parser/terror",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "YoDiJ3sniNqxkP5X/BDkx6efteA=", "checksumSHA1": "YoDiJ3sniNqxkP5X/BDkx6efteA=",
"path": "github.com/pingcap/parser/types", "path": "github.com/pingcap/parser/types",
"revision": "60752e9154861ea1890cff3cdf84e75e67b02281", "revision": "a4bdcab31117b4b4cbfbdb792307e3332534950d",
"revisionTime": "2018-12-26T14:52:28Z" "revisionTime": "2018-12-28T02:29:38Z"
}, },
{ {
"checksumSHA1": "Uv9aqrZqzNFUgUferYPfNGUxOmM=", "checksumSHA1": "Uv9aqrZqzNFUgUferYPfNGUxOmM=",
"path": "github.com/pingcap/tidb/sessionctx/stmtctx", "path": "github.com/pingcap/tidb/sessionctx/stmtctx",
"revision": "e45e6999cbd29fbd14cf8c93669b2e45907b4154", "revision": "71088815e7c5121e069d7ec10595d176a44b9bea",
"revisionTime": "2018-12-27T06:12:19Z" "revisionTime": "2018-12-27T09:14:04Z"
}, },
{ {
"checksumSHA1": "kXyszfR2fQ6bHvuCCFlHRkt1mF0=", "checksumSHA1": "kXyszfR2fQ6bHvuCCFlHRkt1mF0=",
"path": "github.com/pingcap/tidb/types", "path": "github.com/pingcap/tidb/types",
"revision": "e45e6999cbd29fbd14cf8c93669b2e45907b4154", "revision": "71088815e7c5121e069d7ec10595d176a44b9bea",
"revisionTime": "2018-12-27T06:12:19Z" "revisionTime": "2018-12-27T09:14:04Z"
}, },
{ {
"checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=", "checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=",
"path": "github.com/pingcap/tidb/types/json", "path": "github.com/pingcap/tidb/types/json",
"revision": "e45e6999cbd29fbd14cf8c93669b2e45907b4154", "revision": "71088815e7c5121e069d7ec10595d176a44b9bea",
"revisionTime": "2018-12-27T06:12:19Z" "revisionTime": "2018-12-27T09:14:04Z"
}, },
{ {
"checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=", "checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=",
"path": "github.com/pingcap/tidb/types/parser_driver", "path": "github.com/pingcap/tidb/types/parser_driver",
"revision": "e45e6999cbd29fbd14cf8c93669b2e45907b4154", "revision": "71088815e7c5121e069d7ec10595d176a44b9bea",
"revisionTime": "2018-12-27T06:12:19Z" "revisionTime": "2018-12-27T09:14:04Z"
}, },
{ {
"checksumSHA1": "SS7twHZofFKr8w/pwIKmkp3u5qU=", "checksumSHA1": "SS7twHZofFKr8w/pwIKmkp3u5qU=",
"path": "github.com/pingcap/tidb/util/execdetails", "path": "github.com/pingcap/tidb/util/execdetails",
"revision": "e45e6999cbd29fbd14cf8c93669b2e45907b4154", "revision": "71088815e7c5121e069d7ec10595d176a44b9bea",
"revisionTime": "2018-12-27T06:12:19Z" "revisionTime": "2018-12-27T09:14:04Z"
}, },
{ {
"checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=", "checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=",
"path": "github.com/pingcap/tidb/util/hack", "path": "github.com/pingcap/tidb/util/hack",
"revision": "e45e6999cbd29fbd14cf8c93669b2e45907b4154", "revision": "71088815e7c5121e069d7ec10595d176a44b9bea",
"revisionTime": "2018-12-27T06:12:19Z" "revisionTime": "2018-12-27T09:14:04Z"
}, },
{ {
"checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=", "checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=",
"path": "github.com/pingcap/tidb/util/memory", "path": "github.com/pingcap/tidb/util/memory",
"revision": "e45e6999cbd29fbd14cf8c93669b2e45907b4154", "revision": "71088815e7c5121e069d7ec10595d176a44b9bea",
"revisionTime": "2018-12-27T06:12:19Z" "revisionTime": "2018-12-27T09:14:04Z"
}, },
{ {
"checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=", "checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或