diff options
author | Matt Hanlon <hanlon@skytap.com> | 2015-08-07 12:33:09 -0700 |
---|---|---|
committer | Matt Hanlon <hanlon@skytap.com> | 2015-08-07 12:33:09 -0700 |
commit | 5ec9e9349e320e5547c8b36266dbeed07082dd51 (patch) | |
tree | d70c4d41c6e608c1d1f677c6954911f4c43a940d /activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | |
parent | 3fb5cd4d407840ce0a40e4fc82e07a33768a00be (diff) | |
download | rails-5ec9e9349e320e5547c8b36266dbeed07082dd51.tar.gz rails-5ec9e9349e320e5547c8b36266dbeed07082dd51.tar.bz2 rails-5ec9e9349e320e5547c8b36266dbeed07082dd51.zip |
use correct DB connection for generated HABTM table
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb')
-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) |