diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2017-02-15 03:52:18 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-02-24 06:55:46 +0900 |
commit | a5586126d179ad89bf48dd09fb4c8d98be3a841c (patch) | |
tree | 9ccec60b028cb86cd898e32b2ddf081f9b3b0166 /activerecord/lib/active_record | |
parent | 4c5dc11fb94fee3fac3ca8bae5c103c0f3e1acfe (diff) | |
download | rails-a5586126d179ad89bf48dd09fb4c8d98be3a841c.tar.gz rails-a5586126d179ad89bf48dd09fb4c8d98be3a841c.tar.bz2 rails-a5586126d179ad89bf48dd09fb4c8d98be3a841c.zip |
Fix type casting AR object to respect the primary key cast type's serialization
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/quoting.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb index 7f4132accf..a99b58f41c 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb @@ -7,8 +7,11 @@ module ActiveRecord # Quotes the column value to help prevent # {SQL injection attacks}[http://en.wikipedia.org/wiki/SQL_injection]. def quote(value) - # records are quoted as their primary key - return value.quoted_id if value.respond_to?(:quoted_id) + value = id_value_for_database(value) if value.is_a?(Base) + + if value.respond_to?(:quoted_id) + return value.quoted_id + end _quote(value) end @@ -17,6 +20,8 @@ module ActiveRecord # SQLite does not understand dates, so this method will convert a Date # to a String. def type_cast(value, column = nil) + value = id_value_for_database(value) if value.is_a?(Base) + if value.respond_to?(:quoted_id) && value.respond_to?(:id) return value.id end @@ -151,6 +156,12 @@ module ActiveRecord binds.map { |attr| type_cast(attr.value_for_database) } end + def id_value_for_database(value) + if primary_key = value.class.primary_key + value.instance_variable_get(:@attributes)[primary_key].value_for_database + end + end + def types_which_need_no_typecasting [nil, Numeric, String] end |