Skip to content

sql: fix BETWEEN SYMMETRIC normalization to use matching typed lefts #151951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2025
Merged

sql: fix BETWEEN SYMMETRIC normalization to use matching typed lefts #151951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/as_of
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,3 +222,12 @@ statement error pq: AS OF SYSTEM TIME: timestamp '2090-05-08 12:00:00' is in the
CREATE VIEW wontcreate AS SELECT * FROM nonexistent AS OF SYSTEM TIME '2090-05-08 12:00:00'

subtest end

# Regression test for #133395. Ensure that an invalid AS OF SYSTEM TIME clause
# requiring normalization doesn't panic and returns an error.
statement ok
CREATE TABLE v00 (c01 INT)

statement error pq: AS OF SYSTEM TIME: expected timestamp, decimal, or interval, got bool
SELECT ALL FROM ( v00 AS ta1401 NATURAL JOIN v00 AS ta1402 ) WITH ORDINALITY AS ta1403
AS OF SYSTEM TIME b'any_bytes' BETWEEN SYMMETRIC 'abc' AND 'abc';
9 changes: 5 additions & 4 deletions pkg/sql/sem/normalize/normalize_exprs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ func normalizeRangeCond(v *Visitor, expr *tree.RangeCond) tree.TypedExpr {

// "a BETWEEN b AND c" -> "a >= b AND a <= c"
// "a NOT BETWEEN b AND c" -> "a < b OR a > c"
transform := func(from, to tree.TypedExpr) tree.TypedExpr {
transform := func(leftFrom, from, leftTo, to tree.TypedExpr) tree.TypedExpr {
var newLeft, newRight tree.TypedExpr
if from == tree.DNull {
newLeft = tree.DNull
Expand Down Expand Up @@ -425,14 +425,15 @@ func normalizeRangeCond(v *Visitor, expr *tree.RangeCond) tree.TypedExpr {
return normalizeExpr(v, tree.NewTypedAndExpr(newLeft, newRight))
}

out := transform(from, to)
out := transform(leftFrom, from, leftTo, to)
if expr.Symmetric {
symmetricOut := transform(leftTo, to, leftFrom, from)
if expr.Not {
// "a NOT BETWEEN SYMMETRIC b AND c" -> "(a < b OR a > c) AND (a < c OR a > b)"
out = normalizeExpr(v, tree.NewTypedAndExpr(out, transform(to, from)))
out = normalizeExpr(v, tree.NewTypedAndExpr(out, symmetricOut))
} else {
// "a BETWEEN SYMMETRIC b AND c" -> "(a >= b AND a <= c) OR (a >= c OR a <= b)"
out = normalizeExpr(v, tree.NewTypedOrExpr(out, transform(to, from)))
out = normalizeExpr(v, tree.NewTypedOrExpr(out, symmetricOut))
}
}
return out
Expand Down
1 change: 1 addition & 0 deletions pkg/sql/sem/normalize/normalize_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func TestNormalizeExpr(t *testing.T) {
{`a BETWEEN b AND NULL`, `(a >= b) AND NULL`},
{`a BETWEEN SYMMETRIC b AND NULL`, `((a >= b) AND NULL) OR (NULL AND (a <= b))`},
{`a BETWEEN NULL AND NULL`, `NULL`},
{`b'bytes' BETWEEN SYMMETRIC 'a' AND 'c'`, `true`},
{`NULL BETWEEN 1 AND 2`, `NULL`},
{`1+1`, `2`},
{`(1+1,2+2,3+3)`, `(2, 4, 6)`},
Expand Down