diff --git a/go.mod b/go.mod index 40c2e7fd2c..8724e4f63f 100644 --- a/go.mod +++ b/go.mod @@ -16,3 +16,5 @@ require ( gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 vitess.io/vitess v0.0.0-20200617014457-5ba6549015c0 ) + +replace github.com/pingcap/parser => github.com/kyleconroy/parser v3.1.2+incompatible diff --git a/go.sum b/go.sum index 0ee088e096..e436ef6164 100644 --- a/go.sum +++ b/go.sum @@ -110,10 +110,14 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/cznic/golex v0.0.0-20181122101858-9c343928389c/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= +github.com/cznic/parser v0.0.0-20160622100904-31edd927e5b1/go.mod h1:2B43mz36vGZNZEwkWi8ayRSSUXLfjL8OkbzwW4NcPMM= github.com/cznic/sortutil v0.0.0-20181122101858-f5f958428db8 h1:LpMLYGyy67BoAFGda1NeOBQwqlv7nUXpm+rIVHGxZZ4= github.com/cznic/sortutil v0.0.0-20181122101858-f5f958428db8/go.mod h1:q2w6Bg5jeox1B+QkJ6Wp/+Vn0G/bo3f1uY7Fn3vivIQ= +github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= +github.com/cznic/y v0.0.0-20170802143616-045f81c6662a/go.mod h1:1rk5VM7oSnA4vjp+hrLQ3HWHa+Y4yPCa3/CsJrcNnvs= github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -369,6 +373,10 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/krishicks/yaml-patch v0.0.10/go.mod h1:Sm5TchwZS6sm7RJoyg87tzxm2ZcKzdRE4Q7TjNhPrME= +github.com/kyleconroy/parser v0.0.0-20200724174532-06f4019b3223 h1:WymtrDL691R6Gy9FIAd1+pjfl6ZYY/yJAujjyDKT5uE= +github.com/kyleconroy/parser v0.0.0-20200724174532-06f4019b3223/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0= +github.com/kyleconroy/parser v3.1.2+incompatible h1:u7vwQ8c/6iXXDm61lWqJNPAq3WcKQL2AqLUel5AHPO4= +github.com/kyleconroy/parser v3.1.2+incompatible/go.mod h1:VlGesiRD8KwxX9lucQIVxJp23QOEv5lMDmd/RZtT38g= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lfittl/pg_query_go v1.0.0 h1:rcHZK5DBEUoxtO6dACP+UVCHKtA1ZsELBW0rSjOXMAE= @@ -461,6 +469,7 @@ github.com/pingcap/check v0.0.0-20191216031241-8a5a85928f12/go.mod h1:PYMCGwN0JH github.com/pingcap/errcode v0.0.0-20180921232412-a1a7271709d9 h1:KH4f4Si9XK6/IW50HtoaiLIFHGkapOM6w83za47UYik= github.com/pingcap/errcode v0.0.0-20180921232412-a1a7271709d9/go.mod h1:4b2X8xSqxIroj/IZ9MX/VGZhAwc11wB9wRIzHvz6SeM= github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011 h1:58naV4XMEqm0hl9LcYo6cZoGBGiLtefMQMF/vo3XLgQ= github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pingcap/failpoint v0.0.0-20191029060244-12f4ac2fd11d h1:F8vp38kTAckN+v8Jlc98uMBvKIzr1a+UhnLyVYn8Q5Q= diff --git a/internal/endtoend/testdata/star_expansion/go/db.go b/internal/endtoend/testdata/star_expansion/mysql/go/db.go similarity index 100% rename from internal/endtoend/testdata/star_expansion/go/db.go rename to internal/endtoend/testdata/star_expansion/mysql/go/db.go diff --git a/internal/endtoend/testdata/star_expansion/go/models.go b/internal/endtoend/testdata/star_expansion/mysql/go/models.go similarity index 100% rename from internal/endtoend/testdata/star_expansion/go/models.go rename to internal/endtoend/testdata/star_expansion/mysql/go/models.go diff --git a/internal/endtoend/testdata/star_expansion/go/query.sql.go b/internal/endtoend/testdata/star_expansion/mysql/go/query.sql.go similarity index 100% rename from internal/endtoend/testdata/star_expansion/go/query.sql.go rename to internal/endtoend/testdata/star_expansion/mysql/go/query.sql.go diff --git a/internal/endtoend/testdata/star_expansion/mysql/query.sql b/internal/endtoend/testdata/star_expansion/mysql/query.sql new file mode 100644 index 0000000000..d330c646f3 --- /dev/null +++ b/internal/endtoend/testdata/star_expansion/mysql/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo (a text, b text); + +/* name: StarExpansion :many */ +SELECT *, *, foo.* FROM foo; diff --git a/internal/endtoend/testdata/star_expansion/sqlc.json b/internal/endtoend/testdata/star_expansion/mysql/sqlc.json similarity index 85% rename from internal/endtoend/testdata/star_expansion/sqlc.json rename to internal/endtoend/testdata/star_expansion/mysql/sqlc.json index ac7c2ed829..ca1108e401 100644 --- a/internal/endtoend/testdata/star_expansion/sqlc.json +++ b/internal/endtoend/testdata/star_expansion/mysql/sqlc.json @@ -2,6 +2,7 @@ "version": "1", "packages": [ { + "engine": "_dolphin", "path": "go", "name": "querytest", "schema": "query.sql", diff --git a/internal/endtoend/testdata/star_expansion/postgresql/go/db.go b/internal/endtoend/testdata/star_expansion/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/star_expansion/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/star_expansion/postgresql/go/models.go b/internal/endtoend/testdata/star_expansion/postgresql/go/models.go new file mode 100644 index 0000000000..ce7117644a --- /dev/null +++ b/internal/endtoend/testdata/star_expansion/postgresql/go/models.go @@ -0,0 +1,12 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + A sql.NullString + B sql.NullString +} diff --git a/internal/endtoend/testdata/star_expansion/postgresql/go/query.sql.go b/internal/endtoend/testdata/star_expansion/postgresql/go/query.sql.go new file mode 100644 index 0000000000..99d87a6cb8 --- /dev/null +++ b/internal/endtoend/testdata/star_expansion/postgresql/go/query.sql.go @@ -0,0 +1,52 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const starExpansion = `-- name: StarExpansion :many +SELECT a, b, a, b, foo.a, foo.b FROM foo +` + +type StarExpansionRow struct { + A sql.NullString + B sql.NullString + A_2 sql.NullString + B_2 sql.NullString + A_3 sql.NullString + B_3 sql.NullString +} + +func (q *Queries) StarExpansion(ctx context.Context) ([]StarExpansionRow, error) { + rows, err := q.db.QueryContext(ctx, starExpansion) + if err != nil { + return nil, err + } + defer rows.Close() + var items []StarExpansionRow + for rows.Next() { + var i StarExpansionRow + if err := rows.Scan( + &i.A, + &i.B, + &i.A_2, + &i.B_2, + &i.A_3, + &i.B_3, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/star_expansion/query.sql b/internal/endtoend/testdata/star_expansion/postgresql/query.sql similarity index 100% rename from internal/endtoend/testdata/star_expansion/query.sql rename to internal/endtoend/testdata/star_expansion/postgresql/query.sql diff --git a/internal/endtoend/testdata/star_expansion/postgresql/sqlc.json b/internal/endtoend/testdata/star_expansion/postgresql/sqlc.json new file mode 100644 index 0000000000..de427d069f --- /dev/null +++ b/internal/endtoend/testdata/star_expansion/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "postgresql", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go index f7b8b2c5f6..1b5540314d 100644 --- a/internal/engine/dolphin/convert.go +++ b/internal/engine/dolphin/convert.go @@ -152,11 +152,15 @@ func convertTableRefsClause(n *pcast.TableRefsClause) *ast.List { } func convertWildCardField(n *pcast.WildCardField) *pg.ColumnRef { + items := []ast.Node{} + if t := n.Table.String(); t != "" { + items = append(items, &pg.String{Str: t}) + } + items = append(items, &pg.A_Star{}) + return &pg.ColumnRef{ Fields: &ast.List{ - Items: []ast.Node{ - &pg.A_Star{}, - }, + Items: items, }, } }