Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: improve support for sqlite named parameters #2259

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# package querytest
query.sql:9:1: column reference "invalid_reference" not found
query.sql:11:10: column reference "invalid_reference" not found
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# package querytest
query.sql:9:1: table alias "p" does not exist
query.sql:11:9: table alias "p" does not exist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions internal/endtoend/testdata/sqlc_arg/sqlite/go/db.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions internal/endtoend/testdata/sqlc_arg/sqlite/go/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 64 additions & 0 deletions internal/endtoend/testdata/sqlc_arg/sqlite/go/query.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions internal/endtoend/testdata/sqlc_arg/sqlite/query.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CREATE TABLE foo (name text not null);

/* name: FuncParamIdent :many */
SELECT name FROM foo WHERE name = sqlc_arg(slug);

/* name: FuncParamString :many */
SELECT name FROM foo WHERE name = sqlc_arg('slug');
12 changes: 12 additions & 0 deletions internal/endtoend/testdata/sqlc_arg/sqlite/sqlc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "1",
"packages": [
{
"engine": "sqlite",
"path": "go",
"name": "querytest",
"schema": "query.sql",
"queries": "query.sql"
}
]
}
52 changes: 45 additions & 7 deletions internal/engine/sqlite/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,16 @@ func (c *cc) convertFuncContext(n *parser.Expr_functionContext) ast.Node {
Args: args,
}
} else {
schema := ""
const sqlcPrefix = "sqlc_"
if strings.HasPrefix(funcName, sqlcPrefix) {
schema = "sqlc"
funcName = funcName[len(sqlcPrefix):]
}
return &ast.FuncCall{
Func: &ast.FuncName{
Name: funcName,
Schema: schema,
Name: funcName,
},
Funcname: &ast.List{
Items: []ast.Node{
Expand All @@ -223,6 +230,7 @@ func (c *cc) convertFuncContext(n *parser.Expr_functionContext) ast.Node {
Args: args,
AggOrder: &ast.List{},
AggDistinct: n.DISTINCT_() != nil,
Location: n.GetStart().GetStart(),
}
}
}
Expand Down Expand Up @@ -253,6 +261,7 @@ func (c *cc) convertColumnNameExpr(n *parser.Expr_qualified_column_nameContext)
Fields: &ast.List{
Items: items,
},
Location: n.GetStart().GetStart(),
}
}

Expand Down Expand Up @@ -509,8 +518,10 @@ func (c *cc) convertLiteral(n *parser.Expr_literalContext) ast.Node {
}

if literal.STRING_LITERAL() != nil {
text := literal.GetText()
unquoted := text[1 : len(text)-1]
return &ast.A_Const{
Val: &ast.String{Str: literal.GetText()},
Val: &ast.String{Str: unquoted},
}
}

Expand Down Expand Up @@ -554,11 +565,38 @@ func (c *cc) convertBinaryNode(n *parser.Expr_binaryContext) ast.Node {

func (c *cc) convertParam(n *parser.Expr_bindContext) ast.Node {
if n.BIND_PARAMETER() != nil {
// Parameter numbers start at one
c.paramCount += 1
return &ast.ParamRef{
Number: c.paramCount,
Location: n.GetStart().GetStart(),
text := n.GetText()
if strings.ContainsRune("@$:", rune(text[0])) {
loc := n.GetStart().GetStart()
return &ast.A_Expr{
Kind: ast.A_Expr_Kind(1),
Name: &ast.List{
Items: []ast.Node{&ast.String{Str: text[:1]}},
},
Rexpr: &ast.ColumnRef{
Name: text[1:],
Fields: &ast.List{
Items: []ast.Node{&ast.String{Str: text[1:]}},
},
Location: loc + 1,
},
Location: loc,
}
}
if text == "?" {
// Parameter numbers start at one
c.paramCount += 1
return &ast.ParamRef{
Number: c.paramCount,
Location: n.GetStart().GetStart(),
}
} else {
argn, _ := strconv.Atoi(text[1:])
return &ast.ParamRef{
Number: argn,
Location: n.GetStart().GetStart(),
Dollar: true,
}
}
}
return todo(n)
Expand Down
6 changes: 6 additions & 0 deletions internal/sql/rewrite/parameters.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ func NamedParameters(engine config.Engine, raw *ast.RawStmt, numbs map[int]bool,
} else {
replace = "?"
}
} else if engine == config.EngineSQLite {
replace = fmt.Sprintf("?%d", argn)
} else {
replace = fmt.Sprintf("$%d", argn)
}
Expand Down Expand Up @@ -130,6 +132,8 @@ func NamedParameters(engine config.Engine, raw *ast.RawStmt, numbs map[int]bool,
var replace string
if engine == config.EngineMySQL || !dollar {
replace = "?"
} else if engine == config.EngineSQLite {
replace = fmt.Sprintf("?%d", argn)
} else {
replace = fmt.Sprintf("$%d", argn)
}
Expand All @@ -156,6 +160,8 @@ func NamedParameters(engine config.Engine, raw *ast.RawStmt, numbs map[int]bool,
var replace string
if engine == config.EngineMySQL || !dollar {
replace = "?"
} else if engine == config.EngineSQLite {
replace = fmt.Sprintf("?%d", argn)
} else {
replace = fmt.Sprintf("$%d", argn)
}
Expand Down