aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-02 11:22:18 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-02 11:22:18 -0700
commitede2f0c71214fa9564df3cbb1f3e60796f1b39bd (patch)
tree1daa605ad7598cd961aa95c269eaef185b8de7bf /activerecord/lib/active_record
parent9cdf8912374bffa8e9b1797237582876a4e8ec4e (diff)
parent39ee74c4058d67dfabaf62b41994eee1a79c1bf2 (diff)
downloadrails-ede2f0c71214fa9564df3cbb1f3e60796f1b39bd.tar.gz
rails-ede2f0c71214fa9564df3cbb1f3e60796f1b39bd.tar.bz2
rails-ede2f0c71214fa9564df3cbb1f3e60796f1b39bd.zip
Merge pull request #11253 from neerajdotname/removed-insert-sql
Removed support for deprecated `insert_sql` in associations.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb2
-rw-r--r--activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb14
2 files changed, 6 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
index 2a0d16ad2c..26b57cae0a 100644
--- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
@@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder
end
def valid_options
- super + [:join_table, :association_foreign_key, :delete_sql, :insert_sql]
+ super + [:join_table, :association_foreign_key, :delete_sql]
end
def build
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 bb3e3db379..fc0d6f7598 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
@@ -18,16 +18,12 @@ module ActiveRecord
end
end
- if options[:insert_sql]
- owner.connection.insert(interpolate(options[:insert_sql], record))
- else
- stmt = join_table.compile_insert(
- join_table[reflection.foreign_key] => owner.id,
- join_table[reflection.association_foreign_key] => record.id
- )
+ stmt = join_table.compile_insert(
+ join_table[reflection.foreign_key] => owner.id,
+ join_table[reflection.association_foreign_key] => record.id
+ )
- owner.class.connection.insert stmt
- end
+ owner.class.connection.insert stmt
record
end