remove parser.UsePositionalParameters

It seems like it is completely unused, or not needed for kotlin anymore
sqlc-dev · May 1, 2022 · b9efe90 · b9efe90
1 parent cb65539
commit b9efe90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/internal/cmd/generate.go b/internal/cmd/generate.go
@@ -171,9 +171,6 @@ func Generate(ctx context.Context, e Env, dir, filename string, stderr io.Writer
 			name = combo.Go.Package
 			lang = "golang"
 		} else if sql.Gen.Kotlin != nil {
-			if sql.Engine == config.EnginePostgreSQL {
-				parseOpts.UsePositionalParameters = true
-			}
 			lang = "kotlin"
 			name = combo.Kotlin.Package
 		} else if sql.Gen.Python != nil {

diff --git a/internal/compiler/parse.go b/internal/compiler/parse.go
@@ -19,18 +19,6 @@ import (
 
 var ErrUnsupportedStatementType = errors.New("parseQuery: unsupported statement type")
 
-func rewriteNumberedParameters(refs []paramRef, raw *ast.RawStmt, sql string) ([]source.Edit, error) {
-	edits := make([]source.Edit, len(refs))
-	for i, ref := range refs {
-		edits[i] = source.Edit{
-			Location: ref.ref.Location - raw.StmtLocation,
-			Old:      fmt.Sprintf("$%d", ref.ref.Number),
-			New:      "?",
-		}
-	}
-	return edits, nil
-}
-
 func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query, error) {
 	if o.Debug.DumpAST {
 		debug.Dump(stmt)
@@ -90,19 +78,14 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
 	if err != nil {
 		return nil, err
 	}
-	if o.UsePositionalParameters {
-		edits, err = rewriteNumberedParameters(refs, raw, rawSQL)
-		if err != nil {
-			return nil, err
-		}
+
+	refs = uniqueParamRefs(refs, dollar)
+	if c.conf.Engine == config.EngineMySQL || !dollar {
+		sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Location < refs[j].ref.Location })
 	} else {
-		refs = uniqueParamRefs(refs, dollar)
-		if c.conf.Engine == config.EngineMySQL || !dollar {
-			sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Location < refs[j].ref.Location })
-		} else {
-			sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Number < refs[j].ref.Number })
-		}
+		sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Number < refs[j].ref.Number })
 	}
+
 	qc, err := buildQueryCatalog(c.catalog, raw.Stmt)
 	if err != nil {
 		return nil, err

diff --git a/internal/opts/parser.go b/internal/opts/parser.go
@@ -1,6 +1,5 @@
 package opts
 
 type Parser struct {
-	UsePositionalParameters bool
-	Debug                   Debug
+	Debug Debug
 }