aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-13 15:30:51 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-13 15:30:51 -0800
commit7b3d85db4c58e2f719981efd6ef5a6b870f6ab49 (patch)
tree571b86ca825c9fb09118c43449cf3f4fb50d2f32 /activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
parent3f54f3100b6c262776ad324bd649ff268600e280 (diff)
downloadrails-7b3d85db4c58e2f719981efd6ef5a6b870f6ab49.tar.gz
rails-7b3d85db4c58e2f719981efd6ef5a6b870f6ab49.tar.bz2
rails-7b3d85db4c58e2f719981efd6ef5a6b870f6ab49.zip
Revert "Split arel_table into method to get a relation and another to memoize the default relation."
This reverts commit bd51790895fc75a3b4e19e8dd7aa6dc389d77068.
Diffstat (limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index ce4e96637b..c646fe488b 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -56,7 +56,7 @@ module ActiveRecord
if @reflection.options[:insert_sql]
@owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record))
else
- relation = arel_table_for(@reflection.options[:join_table])
+ relation = arel_table(@reflection.options[:join_table])
attributes = columns.inject({}) do |attrs, column|
case column.name.to_s
when @reflection.primary_key_name.to_s
@@ -82,7 +82,7 @@ module ActiveRecord
if sql = @reflection.options[:delete_sql]
records.each { |record| @owner.connection.delete(interpolate_sql(sql, record)) }
else
- relation = arel_table_for(@reflection.options[:join_table])
+ relation = arel_table(@reflection.options[:join_table])
relation.conditions(relation[@reflection.primary_key_name].eq(@owner.id).
and(Arel::Predicates::In.new(relation[@reflection.association_foreign_key], records.map(&:id)))
).delete