1 files changed, 12 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index a9e6654aec..9a7b2a47bc 100644
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -99,9 +99,8 @@ module ActiveRecord
 
   module Validations
     def self.included(base) # :nodoc:
-      base.extend ClassMethods
-
       base.send :include, ActiveModel::Validations
+      base.extend ClassMethods
       base.send :include, InstanceMethods
 
       base.define_callbacks :validate_on_create, :validate_on_update
@@ -125,6 +124,17 @@ module ActiveRecord
           object
         end
       end
+
+      def validation_method(on)
+        case on
+        when :create
+          :validate_on_create
+        when :update
+          :validate_on_update
+        else
+          :validate
+        end
+      end
     end
 
     module InstanceMethods