diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-11 09:26:47 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-11 09:26:47 -0300 |
commit | 5ffbcf12f38066feeda850e4ee1022d4b2f3a632 (patch) | |
tree | 877f4c71b4b35d654fbe5f10be043dfead1f4c28 /activerecord/lib/active_record/associations | |
parent | 99ae9b1698077cf4590014efd62dfe117d38d785 (diff) | |
parent | 5ec9e9349e320e5547c8b36266dbeed07082dd51 (diff) | |
download | rails-5ffbcf12f38066feeda850e4ee1022d4b2f3a632.tar.gz rails-5ffbcf12f38066feeda850e4ee1022d4b2f3a632.tar.bz2 rails-5ffbcf12f38066feeda850e4ee1022d4b2f3a632.zip |
Merge pull request #21165 from manlon/master
use correct DB connection for generated HABTM table
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | 10 |
1 files changed, 7 insertions, 3 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 ffd9c9d6fc..b18d99d54e 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 @@ -46,7 +46,7 @@ module ActiveRecord::Associations::Builder join_model = Class.new(ActiveRecord::Base) { class << self; - attr_accessor :class_resolver + attr_accessor :left_model attr_accessor :name attr_accessor :table_name_resolver attr_accessor :left_reflection @@ -58,7 +58,7 @@ module ActiveRecord::Associations::Builder end def self.compute_type(class_name) - class_resolver.compute_type class_name + left_model.compute_type class_name end def self.add_left_association(name, options) @@ -72,11 +72,15 @@ module ActiveRecord::Associations::Builder self.right_reflection = _reflect_on_association(rhs_name) end + def self.retrieve_connection + left_model.retrieve_connection + end + } join_model.name = "HABTM_#{association_name.to_s.camelize}" join_model.table_name_resolver = habtm - join_model.class_resolver = lhs_model + join_model.left_model = lhs_model join_model.add_left_association :left_side, anonymous_class: lhs_model join_model.add_right_association association_name, belongs_to_options(options) |