aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2014-06-09 22:58:28 -0400
committerArthur Neves <arthurnn@gmail.com>2014-06-09 22:58:28 -0400
commit34c77bcf2dea31decc3a0fe78874ab598d7e8651 (patch)
tree75bc11d7f523c4cd5653bcd793ff74fc69eb32a5 /activerecord
parentbcbc4f44ec24b52f75361e6342f063ad8e3892c7 (diff)
downloadrails-34c77bcf2dea31decc3a0fe78874ab598d7e8651.tar.gz
rails-34c77bcf2dea31decc3a0fe78874ab598d7e8651.tar.bz2
rails-34c77bcf2dea31decc3a0fe78874ab598d7e8651.zip
Use HasAndBelongsToMany instead of HABTM
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations.rb2
-rw-r--r--activerecord/lib/active_record/reflection.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 1d1201a838..6222bfe903 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1577,7 +1577,7 @@ module ActiveRecord
scope = nil
end
- habtm_reflection = ActiveRecord::Reflection::HABTMReflection.new(:has_and_belongs_to_many, name, scope, options, self)
+ habtm_reflection = ActiveRecord::Reflection::HasAndBelongsToManyReflection.new(:has_and_belongs_to_many, name, scope, options, self)
builder = Builder::HasAndBelongsToMany.new name, self, options
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index d6686151be..24f3de019d 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -542,7 +542,7 @@ Joining, Preloading and eager loading of these associations is deprecated and wi
end
end
- class HABTMReflection < AssociationReflection #:nodoc:
+ class HasAndBelongsToManyReflection < AssociationReflection #:nodoc:
def initialize(macro, name, scope, options, active_record)
super
@collection = true