Merge pull request #15639 from sgrif/sg-column-serialization

Remove YAML serialization workaround for columns

1 files changed, 2 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index 21273364b9..72c6990ba5 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, :sql_type, :default_function
+      attr_reader :name, :cast_type, :null, :sql_type, :default_function
 
       delegate :type, :precision, :scale, :limit, :klass, :accessor,
         :text?, :number?, :binary?, :serialized?, :changed?,
@@ -34,7 +34,7 @@ module ActiveRecord
         @name             = name
         @cast_type        = cast_type
         @sql_type         = sql_type
-        @nullable         = null
+        @null             = null
         @original_default = default
         @default_function = nil
       end
@@ -61,10 +61,6 @@ module ActiveRecord
           clone.instance_variable_set('@cast_type', type)
         end
       end
-
-      def null
-        @nullable
-      end
     end
 
     class NullColumn < Column