diff --git a/internal/endtoend/testdata/insert_values/mysql/go/db.go b/internal/endtoend/testdata/insert_values/mysql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/mysql/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/insert_values/mysql/go/models.go b/internal/endtoend/testdata/insert_values/mysql/go/models.go new file mode 100644 index 0000000000..f5e6321432 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/mysql/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.NullInt32 +} diff --git a/internal/endtoend/testdata/insert_values/mysql/go/query.sql.go b/internal/endtoend/testdata/insert_values/mysql/go/query.sql.go new file mode 100644 index 0000000000..41e1a6a125 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/mysql/go/query.sql.go @@ -0,0 +1,23 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const insertValues = `-- name: InsertValues :exec +INSERT INTO foo (a, b) VALUES (?, ?) +` + +type InsertValuesParams struct { + A sql.NullString + B sql.NullInt32 +} + +func (q *Queries) InsertValues(ctx context.Context, arg InsertValuesParams) error { + _, err := q.db.ExecContext(ctx, insertValues, arg.A, arg.B) + return err +} diff --git a/internal/endtoend/testdata/insert_values/mysql/query.sql b/internal/endtoend/testdata/insert_values/mysql/query.sql new file mode 100644 index 0000000000..78a29ccd39 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/mysql/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo (a text, b integer); + +/* name: InsertValues :exec */ +INSERT INTO foo (a, b) VALUES (?, ?); diff --git a/internal/endtoend/testdata/insert_values/mysql/sqlc.json b/internal/endtoend/testdata/insert_values/mysql/sqlc.json new file mode 100644 index 0000000000..ca1108e401 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/mysql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "_dolphin", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/insert_values/postgresql/go/db.go b/internal/endtoend/testdata/insert_values/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/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/insert_values/postgresql/go/models.go b/internal/endtoend/testdata/insert_values/postgresql/go/models.go new file mode 100644 index 0000000000..f5e6321432 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/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.NullInt32 +} diff --git a/internal/endtoend/testdata/insert_values/postgresql/go/query.sql.go b/internal/endtoend/testdata/insert_values/postgresql/go/query.sql.go new file mode 100644 index 0000000000..3e1601dc44 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/postgresql/go/query.sql.go @@ -0,0 +1,23 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const insertValues = `-- name: InsertValues :exec +INSERT INTO foo (a, b) VALUES ($1, $2) +` + +type InsertValuesParams struct { + A sql.NullString + B sql.NullInt32 +} + +func (q *Queries) InsertValues(ctx context.Context, arg InsertValuesParams) error { + _, err := q.db.ExecContext(ctx, insertValues, arg.A, arg.B) + return err +} diff --git a/internal/endtoend/testdata/insert_values/postgresql/query.sql b/internal/endtoend/testdata/insert_values/postgresql/query.sql new file mode 100644 index 0000000000..b2ec168840 --- /dev/null +++ b/internal/endtoend/testdata/insert_values/postgresql/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo (a text, b integer); + +-- name: InsertValues :exec +INSERT INTO foo (a, b) VALUES ($1, $2); diff --git a/internal/endtoend/testdata/insert_values/postgresql/sqlc.json b/internal/endtoend/testdata/insert_values/postgresql/sqlc.json new file mode 100644 index 0000000000..de427d069f --- /dev/null +++ b/internal/endtoend/testdata/insert_values/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 143a2cf16e..aeaeecf116 100644 --- a/internal/engine/dolphin/convert.go +++ b/internal/engine/dolphin/convert.go @@ -132,6 +132,17 @@ func (c *cc) convertColumnNameExpr(n *pcast.ColumnNameExpr) *pg.ColumnRef { } } +func (c *cc) convertColumnNames(cols []*pcast.ColumnName) *ast.List { + list := &ast.List{Items: []ast.Node{}} + for i := range cols { + name := cols[i].Name.String() + list.Items = append(list.Items, &pg.ResTarget{ + Name: &name, + }) + } + return list +} + func (c *cc) convertDropTableStmt(n *pcast.DropTableStmt) ast.Node { drop := &ast.DropTableStmt{IfExists: n.IfExists} for _, name := range n.Tables { @@ -156,6 +167,43 @@ func (c *cc) convertFieldList(n *pcast.FieldList) *ast.List { return &ast.List{Items: fields} } +func (c *cc) convertInsertStmt(n *pcast.InsertStmt) *pg.InsertStmt { + debug.Dump(n) + + rels := c.convertTableRefsClause(n.Table) + if len(rels.Items) != 1 { + panic("expected one range var") + } + rel := rels.Items[0] + rangeVar, ok := rel.(*pg.RangeVar) + if !ok { + panic("expected range var") + } + + return &pg.InsertStmt{ + Relation: rangeVar, + Cols: c.convertColumnNames(n.Columns), + ReturningList: &ast.List{Items: []ast.Node{}}, + SelectStmt: &pg.SelectStmt{ + FromClause: &ast.List{Items: []ast.Node{}}, + TargetList: &ast.List{Items: []ast.Node{}}, + ValuesLists: c.convertLists(n.Lists), + }, + } +} + +func (c *cc) convertLists(lists [][]pcast.ExprNode) *ast.List { + list := &ast.List{Items: []ast.Node{}} + for _, exprs := range lists { + inner := &ast.List{Items: []ast.Node{}} + for _, expr := range exprs { + inner.Items = append(inner.Items, c.convert(expr)) + } + list.Items = append(list.Items, inner) + } + return list +} + func (c *cc) convertParamMarkerExpr(n *driver.ParamMarkerExpr) *pg.ParamRef { // Parameter numbers start at one c.paramCount += 1 @@ -256,6 +304,9 @@ func (c *cc) convert(node pcast.Node) ast.Node { case *pcast.ExistsSubqueryExpr: return c.convertExistsSubqueryExpr(n) + case *pcast.InsertStmt: + return c.convertInsertStmt(n) + case *pcast.SelectStmt: return c.convertSelectStmt(n)