Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip relationship query when we know there are none #14480

Merged
merged 1 commit into from
Mar 27, 2017
Merged

Skip relationship query when we know there are none #14480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/models/mixins/relationship_mixin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ def parent_rel_ids
# Returns all of the relationships of the parents of the record, [] for a root node
def parent_rels(*args)
options = args.extract_options!
rels = Relationship.where(:id => parent_rel_ids)
pri = parent_rel_ids
rels = pri.kind_of?(Array) && pri.empty? ? Relationship.none : Relationship.where(:id => parent_rel_ids)
Relationship.filter_by_resource_type(rels, options)
end

Expand Down