diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2014-06-11 07:59:29 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2014-06-11 07:59:29 -0600 |
| commit | 4a2be83a7b9c71a952ae98e2aa63933b3a19b5e0 (patch) | |
| tree | a7ca1e785a1e8a1c1805b8df3074314e379ce930 /activerecord/lib | |
| parent | ef4e0787d757c40a23bee4558db4d2525ca8cbef (diff) | |
| download | rails-4a2be83a7b9c71a952ae98e2aa63933b3a19b5e0.tar.gz rails-4a2be83a7b9c71a952ae98e2aa63933b3a19b5e0.tar.bz2 rails-4a2be83a7b9c71a952ae98e2aa63933b3a19b5e0.zip | |
Remove YAML serialization workaround for columns
We are no longer including column objects in YAML serialization, thanks
to https://github.com/rails/rails/pull/15621
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/column.rb | 8 |
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 |