aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorEgor Lynko <flexoid@gmail.com>2012-04-29 19:39:16 +0300
committerEgor Lynko <flexoid@gmail.com>2012-05-05 23:35:25 +0300
commit7f160b06a24547a41a59994a736d6b11beb0c30e (patch)
tree91658a38ec77d7c6b92d347cb1ead39725f201ee /activerecord/lib
parentdcd04e76179611a9db28c9e391aa7d6c2a5b046a (diff)
downloadrails-7f160b06a24547a41a59994a736d6b11beb0c30e.tar.gz
rails-7f160b06a24547a41a59994a736d6b11beb0c30e.tar.bz2
rails-7f160b06a24547a41a59994a736d6b11beb0c30e.zip
Prevent creating valid time-like objects from blank string from db
Issue #6045
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/column.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index 9af8e46120..1933ce2b46 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -158,7 +158,7 @@ module ActiveRecord
def value_to_date(value)
if value.is_a?(String)
- return nil if value.empty?
+ return nil if value.blank?
fast_string_to_date(value) || fallback_string_to_date(value)
elsif value.respond_to?(:to_date)
value.to_date
@@ -169,14 +169,14 @@ module ActiveRecord
def string_to_time(string)
return string unless string.is_a?(String)
- return nil if string.empty?
+ return nil if string.blank?
fast_string_to_time(string) || fallback_string_to_time(string)
end
def string_to_dummy_time(string)
return string unless string.is_a?(String)
- return nil if string.empty?
+ return nil if string.blank?
string_to_time "2000-01-01 #{string}"
end