diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-13 20:09:45 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-13 20:09:45 -0300 |
| commit | 7244e57de8793f3f2edd90122a4ef112b60f9be6 (patch) | |
| tree | 7cbeb4d1af395a9d70c551fddf72a31859200a7f /activerecord/lib/active_record | |
| parent | c0ba02281e50a77733c7034b5d249325e789426e (diff) | |
| parent | f61d9755964af3c1812e75238e34b53ffb1f0b6a (diff) | |
| download | rails-7244e57de8793f3f2edd90122a4ef112b60f9be6.tar.gz rails-7244e57de8793f3f2edd90122a4ef112b60f9be6.tar.bz2 rails-7244e57de8793f3f2edd90122a4ef112b60f9be6.zip | |
Merge pull request #15702 from sgrif/sg-rm-serialized
Remove `serialized?` from the type interface
Diffstat (limited to 'activerecord/lib/active_record')
4 files changed, 2 insertions, 14 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb index 72c6990ba5..d629fca911 100644 --- a/activerecord/lib/active_record/connection_adapters/column.rb +++ b/activerecord/lib/active_record/connection_adapters/column.rb @@ -16,7 +16,7 @@ module ActiveRecord attr_reader :name, :cast_type, :null, :sql_type, :default_function delegate :type, :precision, :scale, :limit, :klass, :accessor, - :text?, :number?, :binary?, :serialized?, :changed?, + :text?, :number?, :binary?, :changed?, :type_cast_from_user, :type_cast_from_database, :type_cast_for_database, :type_cast_for_schema, to: :cast_type diff --git a/activerecord/lib/active_record/serializers/xml_serializer.rb b/activerecord/lib/active_record/serializers/xml_serializer.rb index 019fe2218e..c2484d02ed 100644 --- a/activerecord/lib/active_record/serializers/xml_serializer.rb +++ b/activerecord/lib/active_record/serializers/xml_serializer.rb @@ -182,11 +182,7 @@ module ActiveRecord #:nodoc: klass = @serializable.class column = klass.columns_hash[name] || Type::Value.new - type = if column.serialized? - super - else - column.type - end + type = ActiveSupport::XmlMini::TYPE_NAMES[value.class.name] || column.type { :text => :string, :time => :datetime }[type] || type diff --git a/activerecord/lib/active_record/type/serialized.rb b/activerecord/lib/active_record/type/serialized.rb index ebde14634c..42bbed7103 100644 --- a/activerecord/lib/active_record/type/serialized.rb +++ b/activerecord/lib/active_record/type/serialized.rb @@ -26,10 +26,6 @@ module ActiveRecord end end - def serialized? - true - end - def accessor ActiveRecord::Store::IndifferentHashAccessor end diff --git a/activerecord/lib/active_record/type/value.rb b/activerecord/lib/active_record/type/value.rb index b34d1697cd..875fb98c4b 100644 --- a/activerecord/lib/active_record/type/value.rb +++ b/activerecord/lib/active_record/type/value.rb @@ -44,10 +44,6 @@ module ActiveRecord false end - def serialized? - false - end - def klass # :nodoc: end |