diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-19 13:57:14 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-19 13:57:14 -0800 |
| commit | ccaa3e47c4fd1e35bbd986faf1b4994fce3d68d0 (patch) | |
| tree | 1b5e992df52608c53c2d4536562e497fbe236e8c /activerecord/lib | |
| parent | ecde74e1b00d72113775b17ad953cc95ecac3627 (diff) | |
| parent | 4a720a2cdefc1926e0bfa23b8febd71869093c59 (diff) | |
| download | rails-ccaa3e47c4fd1e35bbd986faf1b4994fce3d68d0.tar.gz rails-ccaa3e47c4fd1e35bbd986faf1b4994fce3d68d0.tar.bz2 rails-ccaa3e47c4fd1e35bbd986faf1b4994fce3d68d0.zip | |
Merge pull request #13412 from arthurnn/quote_id_not_id
quoting: Check if id is a valid method before using it
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/quoting.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb index 552a22d28a..75501852ed 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb @@ -43,7 +43,9 @@ module ActiveRecord # SQLite does not understand dates, so this method will convert a Date # to a String. def type_cast(value, column) - return value.id if value.respond_to?(:quoted_id) + if value.respond_to?(:quoted_id) && value.respond_to?(:id) + return value.id + end case value when String, ActiveSupport::Multibyte::Chars |