fixes #3603: replaced a relation with a collection in 'where' conditions #1021
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
|
Could you add some tests please? |
| @@ -14,7 +14,7 @@ def index | |||
| values = Puppetclass.search_for "" | |||
| end | |||
| @puppetclasses = values.paginate(:page => params[:page]) | |||
| @host_counter = Host.group(:puppetclass_id).joins(:puppetclasses).where(:puppetclasses => {:id => @puppetclasses.pluck(:id)}).count | |||
| @host_counter = Host.group(:puppetclass_id).joins(:puppetclasses).where(:puppetclasses => {:id => @puppetclasses.collect(&:id)}).count | |||
There was a problem hiding this comment.
IMHO, if we are changing it already, we might as well change it to an INNER SELECT style which rails 3.2+ supports.
this was done prior to that.
There was a problem hiding this comment.
no point, as @puppetclasses is used in the view.
There was a problem hiding this comment.
not sure i follow, afair, you can just change
where(:puppetclasses => @puppetclasses)There was a problem hiding this comment.
Nods, I suppose that is more concise. I'll see if sub select works with this syntax (the original issue was AR stripping all joins from the relation).
|
Merged as 9e08f30 for Foreman 1.3.2, thanks @witlessbird. |
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.
No description provided.