diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-09 20:17:59 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-09 20:17:59 -0300 |
commit | a929d78d7b4a1341c0ed538cdcce0b381f410a35 (patch) | |
tree | cf01eb4e4f4b172b040e90f976705145d7e26c67 /activerecord/lib/active_record/associations | |
parent | 3c27b6ee7e34a3ee2e73c3e77f7a13c60b53c3d2 (diff) | |
download | rails-a929d78d7b4a1341c0ed538cdcce0b381f410a35.tar.gz rails-a929d78d7b4a1341c0ed538cdcce0b381f410a35.tar.bz2 rails-a929d78d7b4a1341c0ed538cdcce0b381f410a35.zip |
Move macro to class level
Diffstat (limited to 'activerecord/lib/active_record/associations')
4 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index c731d3a080..df9cc65758 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -53,10 +53,10 @@ module ActiveRecord::Associations::Builder end def build(model) - ActiveRecord::Reflection.create(macro, name, scope, options, model) + ActiveRecord::Reflection.create(self.class.macro, name, scope, options, model) end - def macro + def self.macro raise NotImplementedError end diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb index 38034f6bc6..e5cf6576a5 100644 --- a/activerecord/lib/active_record/associations/builder/belongs_to.rb +++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb @@ -1,6 +1,6 @@ module ActiveRecord::Associations::Builder class BelongsTo < SingularAssociation #:nodoc: - def macro + def self.macro :belongs_to end diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb index bdbbb61ada..227184cd19 100644 --- a/activerecord/lib/active_record/associations/builder/has_many.rb +++ b/activerecord/lib/active_record/associations/builder/has_many.rb @@ -1,6 +1,6 @@ module ActiveRecord::Associations::Builder class HasMany < CollectionAssociation #:nodoc: - def macro + def self.macro :has_many end diff --git a/activerecord/lib/active_record/associations/builder/has_one.rb b/activerecord/lib/active_record/associations/builder/has_one.rb index 49940d5f2e..2d9f012bc8 100644 --- a/activerecord/lib/active_record/associations/builder/has_one.rb +++ b/activerecord/lib/active_record/associations/builder/has_one.rb @@ -1,6 +1,6 @@ module ActiveRecord::Associations::Builder class HasOne < SingularAssociation #:nodoc: - def macro + def self.macro :has_one end |