1 files changed, 20 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index d629fca911..af307b57a4 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -13,7 +13,7 @@ module ActiveRecord
         ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/
       end
 
-      attr_reader :name, :cast_type, :null, :sql_type, :default_function
+      attr_reader :name, :cast_type, :null, :sql_type, :default, :default_function
 
       delegate :type, :precision, :scale, :limit, :klass, :accessor,
         :text?, :number?, :binary?, :changed?,
@@ -35,7 +35,7 @@ module ActiveRecord
         @cast_type        = cast_type
         @sql_type         = sql_type
         @null             = null
-        @original_default = default
+        @default          = default
         @default_function = nil
       end
 
@@ -51,21 +51,30 @@ module ActiveRecord
         Base.human_attribute_name(@name)
       end
 
-      def default
-        @default ||= type_cast_from_database(@original_default)
-      end
-
       def with_type(type)
         dup.tap do |clone|
-          clone.instance_variable_set('@default', nil)
           clone.instance_variable_set('@cast_type', type)
         end
       end
-    end
 
-    class NullColumn < Column
-      def initialize(name)
-        super name, nil, Type::Value.new
+      def ==(other)
+        other.name == name &&
+          other.default == default &&
+          other.cast_type == cast_type &&
+          other.sql_type == sql_type &&
+          other.null == null &&
+          other.default_function == default_function
+      end
+      alias :eql? :==
+
+      def hash
+        attributes_for_hash.hash
+      end
+
+      private
+
+      def attributes_for_hash
+        [self.class, name, default, cast_type, sql_type, null, default_function]
       end
     end
   end