Remove deprecated Reflection#source_macro

rails · Jan 4, 2015 · ede8c19 · ede8c19
1 parent 9013e28
commit ede8c19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated `Reflection#source_macro`.
+
+    *Rafael Mendonça França*
+
 *   Remove deprecated `symbolized_base_class` and `symbolized_sti_name`.
 
     *Rafael Mendonça França*

diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
@@ -153,15 +153,6 @@ def join_keys(association_klass)
         JoinKeys.new(foreign_key, active_record_primary_key)
       end
 
-      def source_macro
-        ActiveSupport::Deprecation.warn(<<-MSG.squish)
-          ActiveRecord::Base.source_macro is deprecated and will be removed
-          without replacement.
-        MSG
-
-        macro
-      end
-
       def constraints
         scope_chain.flatten
       end
@@ -763,16 +754,6 @@ def join_keys(association_klass)
         source_reflection.join_keys(association_klass)
       end
 
-      # The macro used by the source association
-      def source_macro
-        ActiveSupport::Deprecation.warn(<<-MSG.squish)
-          ActiveRecord::Base.source_macro is deprecated and will be removed
-          without replacement.
-        MSG
-
-        source_reflection.source_macro
-      end
-
       # A through association is nested if there would be more than one join table
       def nested?
         chain.length > 2