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
6 changes: 6 additions & 0 deletions parser/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ func (l *parserLexer) Lex(lval *pgSymType) int {
lval.str = tok.Str
case ICONST:
lval.ival = tok.Ival
case PARAM:
// The PARAM token ($1, $2, ...) carries its number in Token.Ival
// (see Lexer.lexParam), but this switch never copied it into lval,
// so every ParamRef parsed with Number 0 regardless of its actual
// position.
lval.ival = tok.Ival
case FCONST, SCONST, BCONST, XCONST:
lval.str = tok.Str
case Op:
Expand Down
63 changes: 63 additions & 0 deletions parser/parsertest/paramref_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package parsertest

import (
"testing"

"github.com/pgplex/pgparser/nodes"
"github.com/pgplex/pgparser/parser"
)

// Regression test: parserLexer.Lex() had no case for the PARAM token in its
// switch that copies lexer token data into the yacc semantic value, so
// lval.ival was never set for a bind parameter even though the lexer itself
// (Lexer.lexParam) scans its number correctly. Every $N parsed with
// ParamRef.Number == 0 regardless of its actual position.
func TestParseParamRefNumber(t *testing.T) {
input := "SELECT $1, $2 FROM t WHERE id = $1"

result, err := parser.Parse(input)
if err != nil {
t.Fatalf("Parse error: %v", err)
}
if result == nil || len(result.Items) != 1 {
t.Fatal("expected 1 statement")
}

stmt, ok := result.Items[0].(*nodes.SelectStmt)
if !ok {
t.Fatalf("expected *nodes.SelectStmt, got %T", result.Items[0])
}
if stmt.TargetList == nil || len(stmt.TargetList.Items) != 2 {
t.Fatal("expected 2 target list entries")
}

wantNumber := func(t *testing.T, n nodes.Node, want int) {
t.Helper()
rt, ok := n.(*nodes.ResTarget)
if !ok {
t.Fatalf("expected *nodes.ResTarget, got %T", n)
}
pr, ok := rt.Val.(*nodes.ParamRef)
if !ok {
t.Fatalf("expected *nodes.ParamRef, got %T", rt.Val)
}
if pr.Number != want {
t.Errorf("ParamRef.Number = %d, want %d", pr.Number, want)
}
}

wantNumber(t, stmt.TargetList.Items[0], 1)
wantNumber(t, stmt.TargetList.Items[1], 2)

where, ok := stmt.WhereClause.(*nodes.A_Expr)
if !ok {
t.Fatalf("expected *nodes.A_Expr, got %T", stmt.WhereClause)
}
pr, ok := where.Rexpr.(*nodes.ParamRef)
if !ok {
t.Fatalf("expected *nodes.ParamRef, got %T", where.Rexpr)
}
if pr.Number != 1 {
t.Errorf("WHERE clause ParamRef.Number = %d, want 1", pr.Number)
}
}