diff --git a/internal/endtoend/testdata/select_limit/mysql/go/db.go b/internal/endtoend/testdata/select_limit/mysql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/select_limit/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/select_limit/mysql/go/models.go b/internal/endtoend/testdata/select_limit/mysql/go/models.go new file mode 100644 index 0000000000..6ba5de081e --- /dev/null +++ b/internal/endtoend/testdata/select_limit/mysql/go/models.go @@ -0,0 +1,11 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + A sql.NullString +} diff --git a/internal/endtoend/testdata/select_limit/mysql/go/query.sql.go b/internal/endtoend/testdata/select_limit/mysql/go/query.sql.go new file mode 100644 index 0000000000..5e35166ef7 --- /dev/null +++ b/internal/endtoend/testdata/select_limit/mysql/go/query.sql.go @@ -0,0 +1,70 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const fooLimit = `-- name: FooLimit :many +SELECT a FROM foo +LIMIT ? +` + +func (q *Queries) FooLimit(ctx context.Context, limit int32) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, fooLimit, limit) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullString + for rows.Next() { + var a sql.NullString + if err := rows.Scan(&a); err != nil { + return nil, err + } + items = append(items, a) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const fooLimitOffset = `-- name: FooLimitOffset :many +SELECT a FROM foo +LIMIT ? OFFSET ? +` + +type FooLimitOffsetParams struct { + Limit int32 + Offset int32 +} + +func (q *Queries) FooLimitOffset(ctx context.Context, arg FooLimitOffsetParams) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, fooLimitOffset, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullString + for rows.Next() { + var a sql.NullString + if err := rows.Scan(&a); err != nil { + return nil, err + } + items = append(items, a) + } + 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/select_limit/mysql/query.sql b/internal/endtoend/testdata/select_limit/mysql/query.sql new file mode 100644 index 0000000000..4b5e81997f --- /dev/null +++ b/internal/endtoend/testdata/select_limit/mysql/query.sql @@ -0,0 +1,9 @@ +CREATE TABLE foo (a text); + +/* name: FooLimit :many */ +SELECT a FROM foo +LIMIT ?; + +/* name: FooLimitOffset :many */ +SELECT a FROM foo +LIMIT ? OFFSET ?; diff --git a/internal/endtoend/testdata/select_limit/mysql/sqlc.json b/internal/endtoend/testdata/select_limit/mysql/sqlc.json new file mode 100644 index 0000000000..ca1108e401 --- /dev/null +++ b/internal/endtoend/testdata/select_limit/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/select_limit/postgresql/go/db.go b/internal/endtoend/testdata/select_limit/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/select_limit/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/select_limit/postgresql/go/models.go b/internal/endtoend/testdata/select_limit/postgresql/go/models.go new file mode 100644 index 0000000000..6ba5de081e --- /dev/null +++ b/internal/endtoend/testdata/select_limit/postgresql/go/models.go @@ -0,0 +1,11 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + A sql.NullString +} diff --git a/internal/endtoend/testdata/select_limit/postgresql/go/query.sql.go b/internal/endtoend/testdata/select_limit/postgresql/go/query.sql.go new file mode 100644 index 0000000000..84ce5a8d36 --- /dev/null +++ b/internal/endtoend/testdata/select_limit/postgresql/go/query.sql.go @@ -0,0 +1,70 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const fooLimit = `-- name: FooLimit :many +SELECT a FROM foo +LIMIT $1 +` + +func (q *Queries) FooLimit(ctx context.Context, limit int32) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, fooLimit, limit) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullString + for rows.Next() { + var a sql.NullString + if err := rows.Scan(&a); err != nil { + return nil, err + } + items = append(items, a) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const fooLimitOffset = `-- name: FooLimitOffset :many +SELECT a FROM foo +LIMIT $1 OFFSET $2 +` + +type FooLimitOffsetParams struct { + Limit int32 + Offset int32 +} + +func (q *Queries) FooLimitOffset(ctx context.Context, arg FooLimitOffsetParams) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, fooLimitOffset, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullString + for rows.Next() { + var a sql.NullString + if err := rows.Scan(&a); err != nil { + return nil, err + } + items = append(items, a) + } + 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/select_limit/postgresql/query.sql b/internal/endtoend/testdata/select_limit/postgresql/query.sql new file mode 100644 index 0000000000..2068bc407a --- /dev/null +++ b/internal/endtoend/testdata/select_limit/postgresql/query.sql @@ -0,0 +1,9 @@ +CREATE TABLE foo (a text); + +-- name: FooLimit :many +SELECT a FROM foo +LIMIT $1; + +-- name: FooLimitOffset :many +SELECT a FROM foo +LIMIT $1 OFFSET $2; diff --git a/internal/endtoend/testdata/select_limit/postgresql/sqlc.json b/internal/endtoend/testdata/select_limit/postgresql/sqlc.json new file mode 100644 index 0000000000..de427d069f --- /dev/null +++ b/internal/endtoend/testdata/select_limit/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 1d8625a3ee..143a2cf16e 100644 --- a/internal/engine/dolphin/convert.go +++ b/internal/engine/dolphin/convert.go @@ -185,11 +185,16 @@ func (c *cc) convertSelectField(n *pcast.SelectField) *pg.ResTarget { } func (c *cc) convertSelectStmt(n *pcast.SelectStmt) *pg.SelectStmt { - return &pg.SelectStmt{ + stmt := &pg.SelectStmt{ TargetList: c.convertFieldList(n.Fields), FromClause: c.convertTableRefsClause(n.From), WhereClause: c.convert(n.Where), } + if n.Limit != nil { + stmt.LimitCount = c.convert(n.Limit.Count) + stmt.LimitOffset = c.convert(n.Limit.Offset) + } + return stmt } func (c *cc) convertSubqueryExpr(n *pcast.SubqueryExpr) ast.Node {