change referenced of #scoped to #scope

codeodor · Mar 20, 2013 · 8d582e5 · 8d582e5
1 parent 28431b2
commit 8d582e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/composite_primary_keys/associations/has_many_association.rb b/lib/composite_primary_keys/associations/has_many_association.rb
@@ -8,7 +8,7 @@ def delete_records(records, method)
         else
           # CPK
           # keys  = records.map { |r| r[reflection.association_primary_key] }
-          # scope = scoped.where(reflection.association_primary_key => keys)
+          # scope = scope.where(reflection.association_primary_key => keys)
           table = Arel::Table.new(reflection.table_name)
           and_conditions = records.map do |record|
             eq_conditions = Array(reflection.association_primary_key).map do |name|
@@ -22,7 +22,7 @@ def delete_records(records, method)
             condition = condition.or(and_condition)
           end
 
-          scope = scoped.where(condition)
+          scope = scope.where(condition)
 
           if method == :delete_all
             update_counter(-scope.delete_all)

diff --git a/lib/composite_primary_keys/associations/preloader/association.rb b/lib/composite_primary_keys/associations/preloader/association.rb
@@ -4,9 +4,9 @@ class Preloader
       class Association
         def records_for(ids)
           # CPK
-          # scoped.where(association_key.in(ids))
+          # scope.where(association_key.in(ids))
           predicate = cpk_in_predicate(table, reflection.foreign_key, ids)
-          scoped.where(predicate)
+          scope.where(predicate)
         end
 
         def associated_records_by_owner

diff --git a/lib/composite_primary_keys/associations/preloader/belongs_to.rb b/lib/composite_primary_keys/associations/preloader/belongs_to.rb
@@ -5,7 +5,7 @@ class BelongsTo
         def records_for(ids)
           # CPK
           predicate = cpk_in_predicate(table, association_key_name, ids)
-          scoped.where(predicate)
+          scope.where(predicate)
         end
       end
     end

diff --git a/lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb b/lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb
@@ -6,7 +6,7 @@ def records_for(ids)
           # CPK
           #scope = super
           predicate = cpk_in_predicate(join_table, reflection.foreign_key, ids)
-          scope = scoped.where(predicate)
+          scope = scope.where(predicate)
 
           klass.connection.select_all(scope.arel.to_sql, 'SQL', scope.bind_values)
         end