Skip to content

Commit bf6b9a1

Browse files
Denis ShevchenkoEppO
Denis Shevchenko
authored andcommitted
fixed ambiguous column error (#434)
1 parent dffb0f6 commit bf6b9a1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/rolify/adapters/active_record/resource_adapter.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def resources_find(roles_table, relation, role_name)
2727

2828
def in(relation, user, role_names)
2929
roles = user.roles.where(:name => role_names).select("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)}")
30-
relation.where("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)} IN (?) AND ((resource_id = #{quote_table(relation.table_name)}.#{quote_column(relation.primary_key)}) OR (resource_id IS NULL))", roles)
30+
relation.where("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)} IN (?) AND ((#{quote_table(role_class.table_name)}.resource_id = #{quote_table(relation.table_name)}.#{quote_column(relation.primary_key)}) OR (#{quote_table(role_class.table_name)}.resource_id IS NULL))", roles)
3131
end
3232

3333
def applied_roles(relation, children)

0 commit comments

Comments
 (0)