feat(sql): unparse array_has as ANY for Postgres#20654
Merged
alamb merged 4 commits intoapache:mainfrom Mar 31, 2026
Merged
Conversation
nuno-faria
approved these changes
Mar 26, 2026
Comment on lines
+374
to
+376
| let [haystack, needle] = args else { | ||
| return Ok(None); | ||
| }; |
Contributor
There was a problem hiding this comment.
nit: Since args must always contain [haystack, needle] in this case, I wonder if setting the else to unreachable!() would be clearer.
Contributor
There was a problem hiding this comment.
@vimeh would you like to respond to @nuno-faria before we merge this PR in?
Contributor
Author
There was a problem hiding this comment.
Have replaced with an internal_err to match existing patterns I saw.
also went ahead and rebased
544d6fa to
3781668
Compare
PostgreSQL does not have an array_has() function — it uses the `= ANY(array)` operator for array containment checks. Without this dialect override, SQL unparsed for Postgres federation produces invalid syntax. This converts array_has(haystack, needle) to needle = ANY(haystack) in the PostgreSqlDialect.
Replace `Ok(None)` with `internal_err!` in the else branch of the array_has argument destructure, since array_has always takes exactly 2 arguments and the branch is unreachable.
3781668 to
59eefa2
Compare
nuno-faria
reviewed
Mar 31, 2026
Contributor
nuno-faria
left a comment
There was a problem hiding this comment.
@vimeh there's a small problem with the formatting, but other than that LGTM.
Contributor
|
I took the liberty of merging up from main and pushing a fix for |
Contributor
|
Thanks again @nuno-faria and @vimeh |
Rich-T-kid
pushed a commit
to Rich-T-kid/datafusion
that referenced
this pull request
Apr 21, 2026
## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes apache#123` indicates that this PR will close issue apache#123. --> - Closes apache#20653 . ## Rationale for this change <!-- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed. Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes. --> PostgreSQL does not have an `array_has()` function. When the SQL unparser emits `array_has(haystack, needle)` for the Postgres dialect, it produces invalid SQL. The idiomatic equivalent is `needle = ANY(haystack)`. ## What changes are included in this PR? <!-- There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR. --> Adds a `scalar_function_to_sql_overrides` entry in `PostgreSqlDialect` that converts `array_has(haystack, needle)` to `needle = ANY(haystack)` via `ast::Expr::AnyOp`. ## Are these changes tested? <!-- We typically require tests for all PRs in order to: 1. Prevent the code from being accidentally broken by subsequent changes 2. Serve as another way to document the expected behavior of the code If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> Yep, with a unit test comparing default vs Postgres dialect output and a roundtrip integration test for `= ANY()` in a WHERE clause. ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. --> <!-- If there are any breaking changes to public APIs, please add the `api change` label. --> No breaking changes. `array_has` expressions are now unparsed as valid Postgres syntax when using `PostgreSqlDialect`. --------- Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Rationale for this change
PostgreSQL does not have an
array_has()function. When the SQL unparser emitsarray_has(haystack, needle)for the Postgres dialect, it produces invalid SQL. The idiomatic equivalent isneedle = ANY(haystack).What changes are included in this PR?
Adds a
scalar_function_to_sql_overridesentry inPostgreSqlDialectthat convertsarray_has(haystack, needle)toneedle = ANY(haystack)viaast::Expr::AnyOp.Are these changes tested?
Yep, with a unit test comparing default vs Postgres dialect output and a roundtrip integration test for
= ANY()in a WHERE clause.Are there any user-facing changes?
No breaking changes.
array_hasexpressions are now unparsed as valid Postgres syntax when usingPostgreSqlDialect.