diff options
author | Víctor Martínez <knoopx@gmail.com> | 2010-09-30 19:14:47 +0200 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-15 14:02:30 -0800 |
commit | fe0db2b80588446b34f5f89bbe73f04b88fb06c9 (patch) | |
tree | 426675b770434676ce6e750bf0ad3beed00d8d3c /activerecord/lib | |
parent | c594f22e6586e78a9047fd96074e8aa0774f5a56 (diff) | |
download | rails-fe0db2b80588446b34f5f89bbe73f04b88fb06c9.tar.gz rails-fe0db2b80588446b34f5f89bbe73f04b88fb06c9.tar.bz2 rails-fe0db2b80588446b34f5f89bbe73f04b88fb06c9.zip |
to_xml doesn't work in such case: Event.select('title as t').to_xml [#4840 state:resolved]
NilClass.type is no longer defined in Ruby 1.9 and causes ActiveRecord::Base.to_xml to fail with message: undefined method `type' for nil:NilClass
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/serializers/xml_serializer.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/serializers/xml_serializer.rb b/activerecord/lib/active_record/serializers/xml_serializer.rb index 15abf8bac7..0746908131 100644 --- a/activerecord/lib/active_record/serializers/xml_serializer.rb +++ b/activerecord/lib/active_record/serializers/xml_serializer.rb @@ -226,8 +226,14 @@ module ActiveRecord #:nodoc: class Attribute < ActiveModel::Serializers::Xml::Serializer::Attribute #:nodoc: def compute_type - type = @serializable.class.serialized_attributes.has_key?(name) ? - super : @serializable.class.columns_hash[name].type + case + when @serializable.class.serialized_attributes.has_key?(name) + type = super + when @serializable.class.columns_hash.has_key?(name) + type = @serializable.class.columns_hash[name].type + else + type = NilClass + end case type when :text |