aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-28 14:24:51 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-28 14:24:51 -0800
commitac6594921f4d8532b41a956e90ca56aa05f941be (patch)
tree87b4b37433758671ed3ccf65021f40c1b588f01c
parent70e3ee3bc09dd1bcc7b2755e04e65a3361db4cc8 (diff)
parent6415d3ac539a058285e1005cb147d4d344c8ce12 (diff)
downloadrails-ac6594921f4d8532b41a956e90ca56aa05f941be.tar.gz
rails-ac6594921f4d8532b41a956e90ca56aa05f941be.tar.bz2
rails-ac6594921f4d8532b41a956e90ca56aa05f941be.zip
Merge pull request #8644 from acapilleri/abstract_mysql
small refactoring, added blob_or_text_colum? in AbstractMysqlAdapter
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 124a2419ec..52b0b3fe79 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -14,7 +14,7 @@ module ActiveRecord
end
def extract_default(default)
- if sql_type =~ /blob/i || type == :text
+ if blob_or_text_column?
if default.blank?
null || strict ? nil : ''
else
@@ -28,9 +28,13 @@ module ActiveRecord
end
def has_default?
- return false if sql_type =~ /blob/i || type == :text #mysql forbids defaults on blob and text columns
+ return false if blob_or_text_column? #mysql forbids defaults on blob and text columns
super
end
+
+ def blob_or_text_column?
+ sql_type =~ /blob/i || type == :text
+ end
# Must return the relevant concrete adapter
def adapter