Skip to content
Open
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
46 changes: 46 additions & 0 deletions internal/compiler/resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"log/slog"
"strconv"
"strings"

"github.com/sqlc-dev/sqlc/internal/sql/ast"
"github.com/sqlc-dev/sqlc/internal/sql/astutils"
Expand Down Expand Up @@ -142,6 +143,51 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
})

case *ast.A_Expr:
// If one side of the comparison is a direct FuncCall, use the
// function's return type for the parameter. This prevents the
// ColumnRef search below from descending into the function's
// arguments and incorrectly using a nested column's type
// (e.g. DATEDIFF(date_from, NOW()) >= ? should yield int, not date).
var funcCallSide *ast.FuncCall
if fc, ok := n.Lexpr.(*ast.FuncCall); ok {
funcCallSide = fc
} else if fc, ok := n.Rexpr.(*ast.FuncCall); ok {
funcCallSide = fc
}
if funcCallSide != nil {
fun, ferr := c.ResolveFuncCall(funcCallSide)
if ferr == nil && fun.ReturnType != nil && !strings.HasPrefix(fun.ReturnType.Name, "any") && fun.ReturnType.Name != "record" {
paramName := ref.name
if paramName == "" {
fcList := astutils.Search(funcCallSide, func(node ast.Node) bool {
_, ok := node.(*ast.ColumnRef)
return ok
})
if len(fcList.Items) > 0 {
if cr, ok := fcList.Items[0].(*ast.ColumnRef); ok {
items := stringSlice(cr.Fields)
if len(items) > 0 {
paramName = items[len(items)-1]
}
}
}
}
defaultP := named.NewInferredParam(paramName, true)
p, isNamed := params.FetchMerge(ref.ref.Number, defaultP)
a = append(a, Parameter{
Number: ref.ref.Number,
Column: &Column{
Name: p.Name(),
DataType: dataType(fun.ReturnType),
NotNull: p.NotNull(),
IsNamedParam: isNamed,
IsSqlcSlice: p.IsSqlcSlice(),
},
})
continue
}
}

// TODO: While this works for a wide range of simple expressions,
// more complicated expressions will cause this logic to fail.
list := astutils.Search(n.Lexpr, func(node ast.Node) bool {
Expand Down
31 changes: 31 additions & 0 deletions internal/endtoend/testdata/mysql_datediff_type/mysql/db.go

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

16 changes: 16 additions & 0 deletions internal/endtoend/testdata/mysql_datediff_type/mysql/models.go

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

48 changes: 48 additions & 0 deletions internal/endtoend/testdata/mysql_datediff_type/mysql/query.sql.go

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

6 changes: 6 additions & 0 deletions internal/endtoend/testdata/mysql_datediff_type/query.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-- name: GetUpdateableWishlistItemIDs :many
SELECT id
FROM wishlist_item
WHERE DATEDIFF(date_from, NOW()) >= sqlc.arg('min_days_to_date_from')
AND DATEDIFF(date_from, NOW()) <= sqlc.arg('max_days_to_date_from')
AND updated_at < sqlc.arg('updated_by');
5 changes: 5 additions & 0 deletions internal/endtoend/testdata/mysql_datediff_type/schema.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CREATE TABLE wishlist_item (
id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
date_from DATE NOT NULL,
updated_at TIMESTAMP NULL DEFAULT NULL
);
16 changes: 16 additions & 0 deletions internal/endtoend/testdata/mysql_datediff_type/sqlc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "2",
"sql": [
{
"engine": "mysql",
"queries": "query.sql",
"schema": "schema.sql",
"gen": {
"go": {
"package": "mysql_datediff_type",
"out": "mysql"
}
}
}
]
}
Loading