Merge pull request #615 from henriquetatagiba/master

Fix scope overriding join relation query

lib/composite_primary_keys/reflection.rb

@@ -6,6 +6,12 @@ def join_scope(table, foreign_table, foreign_klass)
         scope_chain_items = join_scopes(table, predicate_builder)
         klass_scope       = klass_join_scope(table, predicate_builder)
 
+        if type
+          klass_scope.where!(type => foreign_klass.polymorphic_name)
+        end
+
+        scope_chain_items.inject(klass_scope, &:merge!)
+
         key         = join_primary_key
         foreign_key = join_foreign_key
 
@@ -14,15 +20,11 @@ def join_scope(table, foreign_table, foreign_klass)
         constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
         klass_scope.where!(constraint)
 
-        if type
-          klass_scope.where!(type => foreign_klass.polymorphic_name)
-        end
-
         if klass.finder_needs_type_condition?
           klass_scope.where!(klass.send(:type_condition, table))
         end
 
-        scope_chain_items.inject(klass_scope, &:merge!)
+        klass_scope
       end
     end