Add flatten method and extend filterAnd for nested expressions#97
Merged
vogievetsky merged 4 commits intomasterfrom May 20, 2025
Merged
Add flatten method and extend filterAnd for nested expressions#97vogievetsky merged 4 commits intomasterfrom
vogievetsky merged 4 commits intomasterfrom
Conversation
🦋 Changeset detectedLatest commit: ac190a7 The changes in this PR will be included in the next version bump. This PR includes no changesetsWhen changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
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.
This PR adds a new flatten method to SQL expressions and improves the filterAnd method to handle nested AND expressions correctly.
Changes:
- Base implementation in SqlExpression class returns the expression as-is
- SqlMulti class implementation recursively flattens nested multi expressions with the same operator
- Allows flattening expressions like a AND (b AND c) to a AND b AND c
- Fixed to correctly handle nested AND expressions
- Now recursively filters through nested expressions instead of just top-level ones
- Example: a AND (x AND y AND b) with filter removing 'b' now correctly produces a AND (x AND y)
- Added tests for the new flatten method covering various scenarios including deeply nested expressions
- Added test for nested AND expressions in filterAnd
- Moved removeColumnFromAnd tests from sql-multi.spec.ts to sql-expression.spec.ts and added invariant tests to ensure correctness