Fixes Model.limit(n).delete_all generates incorrect query #200
Conversation
This file contains 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
gurkanindibay
commented
Jun 5, 2023
|
|
||
| puts "stmt klass: #{stmt.class}" | ||
|
|
||
| if conditions |
There was a problem hiding this comment.
Here stmt is type of Arel::DeleteManager. When I added tenant parameter, the new where criteria appears inside IN statement.
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #200 +/- ##
==========================================
+ Coverage 83.31% 84.04% +0.73%
==========================================
Files 15 16 +1
Lines 725 746 +21
==========================================
+ Hits 604 627 +23
+ Misses 121 119 -2 ☔ View full report in Codecov by Sentry. |
* Fix the tenant scoping for delete_all
gurkanindibay
force-pushed
the
issue_195
branch
from
fc7ad0d
to
60bfde1
Compare
|
@serprex can I get approval please? |
gurkanindibay
changed the title
serprex
requested changes
Dec 3, 2023
| # Check if the tenant key is present in the model's column names | ||
| tenant_condition = table[tenant_key].eq(tenant_id) | ||
| # Add the tenant condition to the arel query if it is not already present | ||
| unless arel.constraints.any? { |node| node.to_sql.include?(tenant_condition.to_sql) } |
There was a problem hiding this comment.
tenant_condition.to_sql can be hoisted out of any? loop
There was a problem hiding this comment.
Granted, that will cause an unnecessary to_sql call when arel.constraints.empty?
serprex
approved these changes
Dec 3, 2023
Amit909Singh
approved these changes
Dec 3, 2023
|
@Amit909Singh if you have solution, please address it in another PR |
gurkanindibay
changed the title
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.
I implemented a hook to catch and add tenant into for the issue #195, however when adding a new where criteria, if an IN statement exist, the where criteria is being added into the query inside IN query, not in Delete statement.
I'm using Arel::DeleteManager to manipulate the delete statement.