aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/column.rb
diff options
context:
space:
mode:
authorSam <sam.saffron@gmail.com>2013-04-03 12:14:48 +1100
committerSam <sam.saffron@gmail.com>2013-04-03 12:14:48 +1100
commit0a57f3460119e8fe77250835c0d0fab808ea2ca6 (patch)
tree5124bee932460e1cc9f8b0d4baa58436f19f4697 /activerecord/lib/active_record/connection_adapters/column.rb
parentfc11375584edeaef24ed55a3afde305b15686c75 (diff)
downloadrails-0a57f3460119e8fe77250835c0d0fab808ea2ca6.tar.gz
rails-0a57f3460119e8fe77250835c0d0fab808ea2ca6.tar.bz2
rails-0a57f3460119e8fe77250835c0d0fab808ea2ca6.zip
Per #9999 revert the revert changing so columns are only tested for empty? as opposed to blank?
This is both faster and more correct, added tests to make sure this is not reverted again.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/column.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/column.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index a4b3a0c584..609ccc2ed2 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -161,7 +161,7 @@ module ActiveRecord
def value_to_date(value)
if value.is_a?(String)
- return nil if value.blank?
+ return nil if value.empty?
fast_string_to_date(value) || fallback_string_to_date(value)
elsif value.respond_to?(:to_date)
value.to_date
@@ -172,14 +172,14 @@ module ActiveRecord
def string_to_time(string)
return string unless string.is_a?(String)
- return nil if string.blank?
+ return nil if string.empty?
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.blank?
+ return nil if string.empty?
dummy_time_string = "2000-01-01 #{string}"
@@ -192,7 +192,7 @@ module ActiveRecord
# convert something to a boolean
def value_to_boolean(value)
- if value.is_a?(String) && value.blank?
+ if value.is_a?(String) && value.empty?
nil
else
TRUE_VALUES.include?(value)