diff options
author | Jatinder Singh <jatinder.saundh@gmail.com> | 2009-08-09 20:43:56 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-08-09 21:05:26 -0700 |
commit | 5704ecffadffa04981ec5999c362cb691d4a676e (patch) | |
tree | 8ecf373151bd3adebc707c7f6e8e0a026e494ea0 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
parent | 734e903af5913342c65d4c294e45f9095fa89986 (diff) | |
download | rails-5704ecffadffa04981ec5999c362cb691d4a676e.tar.gz rails-5704ecffadffa04981ec5999c362cb691d4a676e.tar.bz2 rails-5704ecffadffa04981ec5999c362cb691d4a676e.zip |
AR should respect default values for MySQL BINARY and VARBINARY columns.
[#1273 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 2812dbb522..c1f44b51f0 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -76,7 +76,7 @@ module ActiveRecord module ConnectionAdapters class MysqlColumn < Column #:nodoc: def extract_default(default) - if type == :binary || type == :text + if sql_type =~ /blob/i || type == :text if default.blank? return null ? nil : '' else @@ -90,7 +90,7 @@ module ActiveRecord end def has_default? - return false if type == :binary || type == :text #mysql forbids defaults on blob and text columns + return false if sql_type =~ /blob/i || type == :text #mysql forbids defaults on blob and text columns super end |