diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 85aad0d82fed893233000cac027ff4c9b3a6c070..8f858ce1e8b4bff9e53caf9e9a63abe3e8e793b2 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Removed support for deprecated `insert_sql` in associations. + + *Neeraj Singh* + * Removed support for deprecated `finder_sql` in associations. *Neeraj Singh* 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 2a0d16ad2c67bffe0f8f0c4d35ee177bf9fb224d..26b57cae0a29f5437af79de2a98a9a2455b9b414 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 @@ def macro 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 bb3e3db379bc2baffbafdf65799acc70b8fcd294..fc0d6f75985bd7ed4f28f66d725e6625d8dc62b3 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 @@ def insert_record(record, validate = true, raise = false) 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