Skip to content
This repository was archived by the owner on Jan 28, 2021. It is now read-only.

Commit 7486067

Browse files
kuba--theodesp
authored andcommitted
upgrade vitess to v1.4.0
Signed-off-by: kuba-- <kuba@sourced.tech>
1 parent c67ace9 commit 7486067

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed

engine_test.go

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ var queries = []struct {
6565
"SELECT substring(s, 2, 3) FROM mytable",
6666
[]sql.Row{{"irs"}, {"eco"}, {"hir"}},
6767
},
68+
{
69+
`SELECT substring("foo", 2, 2)`,
70+
[]sql.Row{{"oo"}},
71+
},
6872
{
6973
"SELECT YEAR('2007-12-11') FROM mytable",
7074
[]sql.Row{{int32(2007)}, {int32(2007)}, {int32(2007)}},
@@ -137,6 +141,12 @@ var queries = []struct {
137141
{"first", "irst", "rst"},
138142
},
139143
},
144+
{
145+
`SELECT substring("first", 1), substring("second", 2), substring("third", 3)`,
146+
[]sql.Row{
147+
{"first", "econd", "ird"},
148+
},
149+
},
140150
{
141151
"SELECT substring(s2, -1), substring(s2, -2), substring(s2, -3) FROM othertable ORDER BY i2",
142152
[]sql.Row{
@@ -145,7 +155,12 @@ var queries = []struct {
145155
{"t", "st", "rst"},
146156
},
147157
},
148-
158+
{
159+
`SELECT substring("first", -1), substring("second", -2), substring("third", -3)`,
160+
[]sql.Row{
161+
{"t", "nd", "ird"},
162+
},
163+
},
149164
{
150165
"SELECT s FROM mytable INNER JOIN othertable " +
151166
"ON substring(s2, 1, 2) != '' AND i = i2",

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ require (
1010
golang.org/x/net v0.0.0-20181029044818-c44066c5c816 // indirect
1111
google.golang.org/grpc v1.16.0 // indirect
1212
gopkg.in/src-d/go-errors.v1 v1.0.0
13-
gopkg.in/src-d/go-vitess.v1 v1.3.0
13+
gopkg.in/src-d/go-vitess.v1 v1.4.0
1414
)

sql/parse/parse.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,7 @@ func convertCreateTable(c *sqlparser.DDL) (sql.Node, error) {
318318
}
319319

320320
return plan.NewCreateTable(
321-
sql.UnresolvedDatabase(""),
322-
c.NewName.Name.String(),
323-
schema,
324-
), nil
321+
sql.UnresolvedDatabase(""), c.Table.Name.String(), schema), nil
325322
}
326323

327324
func convertInsert(ctx *sql.Context, i *sqlparser.Insert) (sql.Node, error) {
@@ -656,7 +653,15 @@ func exprToExpression(e sqlparser.Expr) (sql.Expression, error) {
656653
case *sqlparser.Default:
657654
return expression.NewDefaultColumn(v.ColName), nil
658655
case *sqlparser.SubstrExpr:
659-
name, err := exprToExpression(v.Name)
656+
var (
657+
name sql.Expression
658+
err error
659+
)
660+
if v.Name != nil {
661+
name, err = exprToExpression(v.Name)
662+
} else {
663+
name, err = exprToExpression(v.StrVal)
664+
}
660665
if err != nil {
661666
return nil, err
662667
}

0 commit comments

Comments
 (0)