Move macro to class level

activerecord/lib/active_record/associations/builder/association.rb

@@ -53,10 +53,10 @@ def initialize(name, scope, options, extension)
     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
 

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
 

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
 

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