Skip to content

Commit b9efe90

Browse files
committed
remove parser.UsePositionalParameters
It seems like it is completely unused, or not needed for kotlin anymore
1 parent cb65539 commit b9efe90

File tree

3 files changed

+7
-28
lines changed

3 files changed

+7
-28
lines changed

internal/cmd/generate.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@ func Generate(ctx context.Context, e Env, dir, filename string, stderr io.Writer
171171
name = combo.Go.Package
172172
lang = "golang"
173173
} else if sql.Gen.Kotlin != nil {
174-
if sql.Engine == config.EnginePostgreSQL {
175-
parseOpts.UsePositionalParameters = true
176-
}
177174
lang = "kotlin"
178175
name = combo.Kotlin.Package
179176
} else if sql.Gen.Python != nil {

internal/compiler/parse.go

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,6 @@ import (
1919

2020
var ErrUnsupportedStatementType = errors.New("parseQuery: unsupported statement type")
2121

22-
func rewriteNumberedParameters(refs []paramRef, raw *ast.RawStmt, sql string) ([]source.Edit, error) {
23-
edits := make([]source.Edit, len(refs))
24-
for i, ref := range refs {
25-
edits[i] = source.Edit{
26-
Location: ref.ref.Location - raw.StmtLocation,
27-
Old: fmt.Sprintf("$%d", ref.ref.Number),
28-
New: "?",
29-
}
30-
}
31-
return edits, nil
32-
}
33-
3422
func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query, error) {
3523
if o.Debug.DumpAST {
3624
debug.Dump(stmt)
@@ -90,19 +78,14 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
9078
if err != nil {
9179
return nil, err
9280
}
93-
if o.UsePositionalParameters {
94-
edits, err = rewriteNumberedParameters(refs, raw, rawSQL)
95-
if err != nil {
96-
return nil, err
97-
}
81+
82+
refs = uniqueParamRefs(refs, dollar)
83+
if c.conf.Engine == config.EngineMySQL || !dollar {
84+
sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Location < refs[j].ref.Location })
9885
} else {
99-
refs = uniqueParamRefs(refs, dollar)
100-
if c.conf.Engine == config.EngineMySQL || !dollar {
101-
sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Location < refs[j].ref.Location })
102-
} else {
103-
sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Number < refs[j].ref.Number })
104-
}
86+
sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Number < refs[j].ref.Number })
10587
}
88+
10689
qc, err := buildQueryCatalog(c.catalog, raw.Stmt)
10790
if err != nil {
10891
return nil, err

internal/opts/parser.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package opts
22

33
type Parser struct {
4-
UsePositionalParameters bool
5-
Debug Debug
4+
Debug Debug
65
}

0 commit comments

Comments
 (0)