fix(sql): between and inside sub-expression

[brunocalza]

Summary

Fixes #6534

The issue here is not the malformed query. The problem is the AND inside a sub-expression. Currently, the parser thinks that the AND inside the sub-expression refers to BETWEEN's AND operator.

There was a special treatment for BETWEEN-CASE, so the problem does not arise in

SELECT x BETWEEN 0 AND CASE WHEN 1 AND 2 THEN 5 ELSE 10 END

but in other cases, such as

SELECT 1 BETWEEN (1 and 2) and 3;
SELECT 1 BETWEEN ARRAY[0 AND 1] AND 2 
SELECT 1 BETWEEN (ARRAY[10, 20, 30])[1 AND 1] AND 3
SELECT 1 BETWEEN CAST(0 AND 1 AS INT) AND 3

the issue arises. These are syntactically correct statements, and they should throw a type mismatch error.

The fix

We keep track of the scope depth when we reach BETWEEN on a variable called betweenStartScopeDepth, and whenever we see an AND we use the current scope depth to know whether the AND refers to BETWEEN or not.

This fix is identical to the treatment given to the BETWEEN-CASE, but it's more generic. We had a betweenStartCaseCount variable that we removed.

How this was tested

This was manually tested, and a unit test was added for each one of the scope cases.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: f121fce4-8021-4a6c-b3e4-3160636c1d6c

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[bluestreak01]

Fix is correct and minimal. Verified against existing BETWEEN tests in SqlParserTest, ExpressionParserTest (295), WhereClauseParserTest (842), and IntervalFilterTest (26) — all pass. The new scopeStack.size() check is a strict superset of the old caseCount check, so CASE behavior is preserved while PAREN/BRACKET/ARRAY/CAST scopes are now handled correctly.

Non-blocking suggestions:

• PR title is missing the verb per CLAUDE.md (fix(sql): fix BETWEEN ...).
• Fixes <URL> won't auto-close issue #6534; use Fixes #6534.
• Add Bug and SQL labels.
• Consider adding an execution-level test that asserts the resulting type-mismatch error, since the original bug surfaced as a runtime AssertionError.