Improve default names for BETWEEN ? AND ? to have prefixes from_ and to_

issue #2277
sqlc-dev · Jun 24, 2023 · 4fe183a · 4fe183a
1 parent 28696e5
commit 4fe183a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go
@@ -255,10 +255,6 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 				}
 			}
 
-			number := 0
-			if pr, ok := n.Left.(*ast.ParamRef); ok {
-				number = pr.Number
-			}
 
 			for _, table := range tables {
 				schema := table.Schema
@@ -269,10 +265,19 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 				if c, ok := typeMap[schema][table.Name][key]; ok {
 					defaultP := named.NewInferredParam(key, c.IsNotNull)
 					p, isNamed := params.FetchMerge(ref.ref.Number, defaultP)
+					var namePrefix string
+					if !isNamed {
+						if ref.ref == n.Left {
+							namePrefix = "from_"
+						} else if ref.ref == n.Right {
+							namePrefix = "to_"
+						}
+					}
+
 					a = append(a, Parameter{
-						Number: number,
+						Number: ref.ref.Number,
 						Column: &Column{
-							Name:         p.Name(),
+							Name:         namePrefix + p.Name(),
 							DataType:     dataType(&c.Type),
 							NotNull:      p.NotNull(),
 							Unsigned:     c.IsUnsigned,

diff --git a/internal/endtoend/testdata/between_args/mysql/go/query.sql.go b/internal/endtoend/testdata/between_args/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/between_args/sqlite/go/query.sql.go b/internal/endtoend/testdata/between_args/sqlite/go/query.sql.go