Merge pull request #593 from erizocosmico/feature/rollback

ajnavarro · web-flow · commit 2f71ae5d2fc7 · 2019-01-18T11:20:31.000+01:00
sql: implement dummy ROLLBACK
diff --git a/engine_test.go b/engine_test.go
@@ -864,6 +864,10 @@ var queries = []struct {
 		"SHOW COLLATION WHERE `Default` = 'Yes'",
 		[]sql.Row{{"utf8_bin", "utf8mb4", int64(1), "Yes", "Yes", int64(1)}},
 	},
+	{
+		"ROLLBACK",
+		[]sql.Row{},
+	},
 }
 
 func TestQueries(t *testing.T) {
diff --git a/sql/parse/parse.go b/sql/parse/parse.go
@@ -145,6 +145,8 @@ func convert(ctx *sql.Context, stmt sqlparser.Statement, query string) (sql.Node
 		return convertSet(ctx, n)
 	case *sqlparser.Use:
 		return convertUse(n)
+	case *sqlparser.Rollback:
+		return plan.NewRollback(), nil
 	}
 }
 
diff --git a/sql/parse/parse_test.go b/sql/parse/parse_test.go
@@ -1007,6 +1007,7 @@ var fixtures = map[string]sql.Node{
 		),
 		plan.NewShowCollation(),
 	),
+	`ROLLBACK`: plan.NewRollback(),
 }
 
 func TestParse(t *testing.T) {
diff --git a/sql/plan/transaction.go b/sql/plan/transaction.go
@@ -0,0 +1,35 @@
+package plan
+
+import "gopkg.in/src-d/go-mysql-server.v0/sql"
+
+// Rollback undoes the changes performed in a transaction.
+type Rollback struct{}
+
+// NewRollback creates a new Rollback node.
+func NewRollback() *Rollback { return new(Rollback) }
+
+// RowIter implements the sql.Node interface.
+func (*Rollback) RowIter(*sql.Context) (sql.RowIter, error) {
+	return sql.RowsToRowIter(), nil
+}
+
+func (*Rollback) String() string { return "ROLLBACK" }
+
+// TransformUp implements the sql.Node interface.
+func (r *Rollback) TransformUp(f sql.TransformNodeFunc) (sql.Node, error) {
+	return f(r)
+}
+
+// TransformExpressionsUp implements the sql.Node interface.
+func (r *Rollback) TransformExpressionsUp(f sql.TransformExprFunc) (sql.Node, error) {
+	return r, nil
+}
+
+// Resolved implements the sql.Node interface.
+func (*Rollback) Resolved() bool { return true }
+
+// Children implements the sql.Node interface.
+func (*Rollback) Children() []sql.Node { return nil }
+
+// Schema implements the sql.Node interface.
+func (*Rollback) Schema() sql.Schema { return nil }

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ func convert(ctx *sql.Context, stmt sqlparser.Statement, query string) (sql.Node`
`145`	`145`	`return convertSet(ctx, n)`
`146`	`146`	`case *sqlparser.Use:`
`147`	`147`	`return convertUse(n)`
	`148`	`+ case *sqlparser.Rollback:`
	`149`	`+ return plan.NewRollback(), nil`
`148`	`150`	`}`
`149`	`151`	`}`
`150`	`152`
Original file line number	Diff line number	Diff line change
`@@ -1007,6 +1007,7 @@ var fixtures = map[string]sql.Node{`
`1007`	`1007`	`),`
`1008`	`1008`	`plan.NewShowCollation(),`
`1009`	`1009`	`),`
	`1010`	+ `ROLLBACK`: plan.NewRollback(),
`1010`	`1011`	`}`
`1011`	`1012`
`1012`	`1013`	`func TestParse(t *testing.T) {`