From 8bfa8e7cbea1fb65b180260c55a7f146efbd5b05 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Feb 2011 10:25:38 -0800
Subject: this method should never return nil
---
activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index babdf4cb58..a04fc01d6f 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -85,7 +85,7 @@ module ActiveRecord
when :datetime, :timestamp then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_time(#{var_name})"
when :time then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_dummy_time(#{var_name})"
when :date then "#{var_name}.class == Date ? #{var_name} : #{self.class.name}.string_to_date(#{var_name})"
- when :binary then nil
+ when :binary then var_name
when :boolean then "#{self.class.name}.value_to_boolean(#{var_name})"
else var_name
end
--
cgit v1.2.3