fix queries

Author: asmyasnikov

examples/authors/ydb-database-sql/queries.sql.go

@@ -3,8 +3,6 @@ package dbsql
 import (
 	"bytes"
 	"context"
-	"regexp"
-	"strconv"
 	"strings"
 	"text/template"
 
@@ -155,21 +153,13 @@ type Queries struct {
 }
 `
 
-// sqlToPositional converts $name placeholders to $1, $2 in param order.
-func sqlToPositional(sql string, paramNames []string) string {
-	for i, name := range paramNames {
-		re := regexp.MustCompile(`\$` + regexp.QuoteMeta(name) + `\b`)
-		sql = re.ReplaceAllString(sql, "$"+strconv.Itoa(i+1))
-	}
-	return sql
-}
-
 func genQueryFile(cat *pb.Catalog, pkg, sourceName string, queries []*pb.Query) ([]byte, error) {
 	var buf bytes.Buffer
 	buf.WriteString("// Code generated by sqlc. DO NOT EDIT.\n// source: " + sourceName + "\n\n")
 	buf.WriteString("package " + pkg + "\n\n")
 	buf.WriteString("import (\n")
-	buf.WriteString("\t\"context\"\n\n")
+	buf.WriteString("\t\"context\"\n")
+	buf.WriteString("\t\"database/sql\"\n\n")
 	buf.WriteString("\t_ \"github.com/ydb-platform/ydb-go-sdk/v3\"\n")
 	buf.WriteString("\t\"github.com/ydb-platform/ydb-go-sdk/v3/pkg/xerrors\"\n")
 	buf.WriteString("\t\"github.com/ydb-platform/ydb-go-sdk/v3/retry\"\n")
@@ -194,16 +184,8 @@ func genQuery(cat *pb.Catalog, pkg string, q *pb.Query) ([]byte, error) {
 	cmd := strings.ToLower(q.GetCmd())
 	text := q.GetText()
 
-	paramNames := make([]string, 0, len(q.GetParams()))
-	for _, p := range q.GetParams() {
-		if col := p.GetColumn(); col != nil && col.GetName() != "" {
-			paramNames = append(paramNames, col.GetName())
-		}
-	}
-	positionalSQL := sqlToPositional(text, paramNames)
-
 	constName := toGoConst(name)
-	buf.WriteString("const " + constName + " = `" + positionalSQL + "`\n\n")
+	buf.WriteString("const " + constName + " = `" + text + "`\n\n")
 
 	if len(q.GetParams()) > 0 {
 		buf.WriteString("type " + name + "Params struct {\n")
@@ -263,14 +245,14 @@ func genOne(cat *pb.Catalog, name, constName string, q *pb.Query) string {
 	}
 
 	sig := "ctx context.Context, id int64"
-	args := "id"
+	args := ""
 	if len(params) > 0 {
 		sig = "ctx context.Context, arg " + name + "Params"
-		args = argList(params)
+		args = namedArgList(params)
 	}
 	b.WriteString("func (q *Queries) " + name + "(" + sig + ") (*" + retType + ", error) {\n")
 	b.WriteString("\ti, err := retry.RetryWithResult(ctx, func(ctx context.Context) (*" + retType + ", error) {\n")
-	b.WriteString("\t\trow := q.db.QueryRowContext(ctx, " + constName + ", " + args + ")\n")
+	b.WriteString("\t\trow := q.db.QueryRowContext(ctx, " + constName + args + ")\n")
 	b.WriteString("\t\tvar i " + retType + "\n")
 	b.WriteString("\t\terr := row.Scan(" + scanTargets(cols) + ")\n")
 	b.WriteString("\t\tif err != nil {\n")
@@ -306,12 +288,12 @@ func genMany(cat *pb.Catalog, name, constName string, q *pb.Query) string {
 	args := ""
 	if len(params) > 0 {
 		sig = "ctx context.Context, arg " + name + "Params"
-		args = argList(params)
+		args = namedArgList(params)
 	}
 	b.WriteString("func (q *Queries) " + name + "(" + sig + ") ([]" + rowType + ", error) {\n")
 	b.WriteString("\titems, err := retry.RetryWithResult(ctx, func(ctx context.Context) ([]" + rowType + ", error) {\n")
 	if len(params) > 0 {
-		b.WriteString("\t\trows, err := q.db.QueryContext(ctx, " + constName + ", " + args + ")\n")
+		b.WriteString("\t\trows, err := q.db.QueryContext(ctx, " + constName + args + ")\n")
 	} else {
 		b.WriteString("\t\trows, err := q.db.QueryContext(ctx, " + constName + ")\n")
 	}
@@ -347,12 +329,12 @@ func genExec(name, constName string, q *pb.Query) string {
 	args := ""
 	if len(params) > 0 {
 		sig = "ctx context.Context, arg " + name + "Params"
-		args = argList(params)
+		args = namedArgList(params)
 	}
 	b.WriteString("func (q *Queries) " + name + "(" + sig + ") error {\n")
 	b.WriteString("\terr := retry.Retry(ctx, func(ctx context.Context) error {\n")
 	if len(params) > 0 {
-		b.WriteString("\t\t_, err := q.db.ExecContext(ctx, " + constName + ", " + args + ")\n")
+		b.WriteString("\t\t_, err := q.db.ExecContext(ctx, " + constName + args + ")\n")
 	} else {
 		b.WriteString("\t\t_, err := q.db.ExecContext(ctx, " + constName + ")\n")
 	}
@@ -369,16 +351,27 @@ func genExec(name, constName string, q *pb.Query) string {
 	return b.String()
 }
 
-func argList(params []*pb.Parameter) string {
+// namedArgList returns the args for QueryRowContext/QueryContext/ExecContext as sql.Named(..., arg.Field).
+// Format: ",\n\t\t\tsql.Named(\"id\", arg.ID),\n\t\t\tsql.Named(\"name\", arg.Name),\n\t\t"
+func namedArgList(params []*pb.Parameter) string {
+	if len(params) == 0 {
+		return ""
+	}
 	var parts []string
 	for _, p := range params {
 		col := p.GetColumn()
 		if col == nil {
 			continue
 		}
-		parts = append(parts, "arg."+toGoField(col.GetName()))
+		paramName := col.GetName()
+		field := "arg." + toGoField(paramName)
+		parts = append(parts, "sql.Named(\""+paramName+"\", "+field+")")
 	}
-	return strings.Join(parts, ", ")
+	if len(parts) == 0 {
+		return ""
+	}
+	// Indent: row/rows/exec is 2 tabs; sql.Named continuation 3 tabs; closing paren 2 tabs.
+	return ",\n\t\t\t" + strings.Join(parts, ",\n\t\t\t") + ",\n\t\t"
 }
 
 func toGoStruct(s string) string {