diff --git a/internal/compiler/output_columns.go b/internal/compiler/output_columns.go index 545869cf6a..8c6d84586b 100644 --- a/internal/compiler/output_columns.go +++ b/internal/compiler/output_columns.go @@ -163,6 +163,8 @@ func (c *Compiler) outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, er cols = append(cols, &Column{Name: name, DataType: "bool", NotNull: true}) case lang.IsMathematicalOperator(astutils.Join(n.Name, "")): cols = append(cols, &Column{Name: name, DataType: "int", NotNull: true}) + case astutils.Join(n.Name, "") == "||": + cols = append(cols, &Column{Name: name, DataType: "text", NotNull: true}) default: cols = append(cols, &Column{Name: name, DataType: "any", NotNull: false}) } diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go index 0a91b45f25..1c956e5c68 100644 --- a/internal/compiler/resolve.go +++ b/internal/compiler/resolve.go @@ -141,7 +141,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, // TODO: Move this to database-specific engine package dataType := "any" if astutils.Join(n.Name, ".") == "||" { - dataType = "string" + dataType = "text" } defaultP := named.NewParam("") diff --git a/internal/endtoend/testdata/concat_operator/postgresql/go/db.go b/internal/endtoend/testdata/concat_operator/postgresql/go/db.go new file mode 100644 index 0000000000..1326bbd119 --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/postgresql/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.21.0 + +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/concat_operator/postgresql/go/models.go b/internal/endtoend/testdata/concat_operator/postgresql/go/models.go new file mode 100644 index 0000000000..08e35e5d58 --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/postgresql/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.21.0 + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + Bar sql.NullString + Baz sql.NullString +} diff --git a/internal/endtoend/testdata/concat_operator/postgresql/go/query.sql.go b/internal/endtoend/testdata/concat_operator/postgresql/go/query.sql.go new file mode 100644 index 0000000000..e9a2d1aabb --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/postgresql/go/query.sql.go @@ -0,0 +1,37 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.21.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const concat = `-- name: Concat :many +SELECT bar || ' ' || baz FROM foo +` + +func (q *Queries) Concat(ctx context.Context) ([]string, error) { + rows, err := q.db.QueryContext(ctx, concat) + if err != nil { + return nil, err + } + defer rows.Close() + var items []string + for rows.Next() { + var column_1 string + if err := rows.Scan(&column_1); err != nil { + return nil, err + } + items = append(items, column_1) + } + 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/concat_operator/postgresql/query.sql b/internal/endtoend/testdata/concat_operator/postgresql/query.sql new file mode 100644 index 0000000000..e0ded7a4ad --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/postgresql/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo(bar TEXT, baz TEXT); + +-- name: Concat :many +SELECT bar || ' ' || baz FROM foo; \ No newline at end of file diff --git a/internal/endtoend/testdata/concat_operator/postgresql/sqlc.json b/internal/endtoend/testdata/concat_operator/postgresql/sqlc.json new file mode 100644 index 0000000000..c72b6132d5 --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/concat_operator/sqlite/go/db.go b/internal/endtoend/testdata/concat_operator/sqlite/go/db.go new file mode 100644 index 0000000000..1326bbd119 --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/sqlite/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.21.0 + +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/concat_operator/sqlite/go/models.go b/internal/endtoend/testdata/concat_operator/sqlite/go/models.go new file mode 100644 index 0000000000..08e35e5d58 --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/sqlite/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.21.0 + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + Bar sql.NullString + Baz sql.NullString +} diff --git a/internal/endtoend/testdata/concat_operator/sqlite/go/query.sql.go b/internal/endtoend/testdata/concat_operator/sqlite/go/query.sql.go new file mode 100644 index 0000000000..e9a2d1aabb --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/sqlite/go/query.sql.go @@ -0,0 +1,37 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.21.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const concat = `-- name: Concat :many +SELECT bar || ' ' || baz FROM foo +` + +func (q *Queries) Concat(ctx context.Context) ([]string, error) { + rows, err := q.db.QueryContext(ctx, concat) + if err != nil { + return nil, err + } + defer rows.Close() + var items []string + for rows.Next() { + var column_1 string + if err := rows.Scan(&column_1); err != nil { + return nil, err + } + items = append(items, column_1) + } + 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/concat_operator/sqlite/query.sql b/internal/endtoend/testdata/concat_operator/sqlite/query.sql new file mode 100644 index 0000000000..e0ded7a4ad --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/sqlite/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo(bar TEXT, baz TEXT); + +-- name: Concat :many +SELECT bar || ' ' || baz FROM foo; \ No newline at end of file diff --git a/internal/endtoend/testdata/concat_operator/sqlite/sqlc.json b/internal/endtoend/testdata/concat_operator/sqlite/sqlc.json new file mode 100644 index 0000000000..bcf1050428 --- /dev/null +++ b/internal/endtoend/testdata/concat_operator/sqlite/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "sqlite", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go index d1e9a8c050..8a156af4f5 100644 --- a/internal/engine/sqlite/convert.go +++ b/internal/engine/sqlite/convert.go @@ -768,7 +768,7 @@ func (c *cc) convertMathOperationNode(n *parser.Expr_math_opContext) ast.Node { return &ast.A_Expr{ Name: &ast.List{ Items: []ast.Node{ - &ast.String{Str: "+"}, // todo: Convert operation types + &ast.String{Str: n.GetChild(1).(antlr.TerminalNode).GetText()}, }, }, Lexpr: c.convert(n.Expr(0)), diff --git a/internal/engine/sqlite/parser/SQLiteParser.g4 b/internal/engine/sqlite/parser/SQLiteParser.g4 index d141603cbc..a30d12b73f 100644 --- a/internal/engine/sqlite/parser/SQLiteParser.g4 +++ b/internal/engine/sqlite/parser/SQLiteParser.g4 @@ -281,7 +281,7 @@ expr: | NAMED_BIND_PARAMETER #expr_bind | ((schema_name DOT)? table_name DOT)? column_name #expr_qualified_column_name | unary_operator expr #expr_unary - | expr PIPE2 expr #expr_binary + | expr PIPE2 expr #expr_math_op | expr ( STAR | DIV | MOD) expr #expr_math_op | expr ( PLUS | MINUS) expr #expr_math_op | expr ( LT2 | GT2 | AMP | PIPE) expr #expr_comparison diff --git a/internal/engine/sqlite/parser/sqlite_parser.go b/internal/engine/sqlite/parser/sqlite_parser.go index 2ee498f565..8f657450fd 100644 --- a/internal/engine/sqlite/parser/sqlite_parser.go +++ b/internal/engine/sqlite/parser/sqlite_parser.go @@ -11582,10 +11582,6 @@ func (s *Expr_binaryContext) Expr(i int) IExprContext { return t.(IExprContext) } -func (s *Expr_binaryContext) PIPE2() antlr.TerminalNode { - return s.GetToken(SQLiteParserPIPE2, 0) -} - func (s *Expr_binaryContext) AND_() antlr.TerminalNode { return s.GetToken(SQLiteParserAND_, 0) } @@ -12278,6 +12274,10 @@ func (s *Expr_math_opContext) Expr(i int) IExprContext { return t.(IExprContext) } +func (s *Expr_math_opContext) PIPE2() antlr.TerminalNode { + return s.GetToken(SQLiteParserPIPE2, 0) +} + func (s *Expr_math_opContext) STAR() antlr.TerminalNode { return s.GetToken(SQLiteParserSTAR, 0) } @@ -12866,7 +12866,7 @@ func (p *SQLiteParser) expr(_p int) (localctx IExprContext) { p.GetErrorHandler().Sync(p) switch p.GetInterpreter().AdaptivePredict(p.GetTokenStream(), 144, p.GetParserRuleContext()) { case 1: - localctx = NewExpr_binaryContext(p, NewExprContext(p, _parentctx, _parentState)) + localctx = NewExpr_math_opContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, SQLiteParserRULE_expr) p.SetState(1007)