TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #15595 from eileencodes/abstract-away-habtm-macro

Browse Source 
Abstract away use of HABTM macro
This commit is contained in:
Aaron Patterson 2014-06-09 16:19:07 -07:00
commit 32b6873d08
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/associations.rb
View File

@ -1577,7 +1577,7 @@ def has_and_belongs_to_many(name, scope = nil, options = {}, &extension)
scope = nil
end
habtm_reflection = ActiveRecord::Reflection::AssociationReflection.new(:has_and_belongs_to_many, name, scope, options, self)
habtm_reflection = ActiveRecord::Reflection::HABTMReflection.new(:has_and_belongs_to_many, name, scope, options, self)
builder = Builder::HasAndBelongsToMany.new name, self, options

9
activerecord/lib/active_record/reflection.rb
View File

@ -228,7 +228,7 @@ def klass
def initialize(macro, name, scope, options, active_record)
super
@collection = [:has_many, :has_and_belongs_to_many].include?(macro)
@collection = macro == :has_many
@automatic_inverse_of = nil
@type = options[:as] && "#{options[:as]}_type"
@foreign_type = options[:foreign_type] || "#{name}_type"
@ -538,6 +538,13 @@ def primary_key(klass)
end
end
class HABTMReflection < AssociationReflection #:nodoc:
def initialize(macro, name, scope, options, active_record)
super
@collection = true
end
end
# Holds all the meta-data about a :through association as it was specified
# in the Active Record class.
class ThroughReflection < AssociationReflection #:nodoc: