regression

lib/cancan/model_adapters/active_record_4_adapter.rb

@@ -34,7 +34,7 @@ def matches_condition?(subject, name, value)
       # look inside the where clause to decide to outer join tables
       # you're using in the where. Instead, `references()` is required
       # in addition to `includes()` to force the outer join.
-      def build_joins_relation(relation)
+      def build_joins_relation(relation, *where_conditions)
         case CanCan.accessible_by_strategy
         when :subquery
           inner = @model_class.unscoped do

lib/cancan/model_adapters/active_record_5_adapter.rb

@@ -21,11 +21,11 @@ def self.matches_condition?(subject, name, value)
 
       private
 
-      def build_joins_relation(relation)
+      def build_joins_relation(relation, *where_conditions)
         case CanCan.accessible_by_strategy
         when :subquery
           inner = @model_class.unscoped do
-            relation.left_joins(joins)
+            @model_class.left_joins(joins).where(*where_conditions)
           end
           @model_class.where(@model_class.primary_key => inner)
 

lib/cancan/model_adapters/active_record_adapter.rb

@@ -64,7 +64,7 @@ def build_relation(*where_conditions)
         return relation unless joins.present?
 
         # subclasses must implement `build_joins_relation`
-        build_joins_relation(relation)
+        build_joins_relation(relation, *where_conditions)
       end
 
       # Returns the associations used in conditions for the :joins option of a search.