aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-30 23:22:58 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-30 23:22:58 +0000
commite59978aa867ef07e16ad64f73f1ed5cafa98d0ea (patch)
treeb217d43b0a2547089b3cb7f30ce9a60c74c6ef68 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
parent1ba5fc745bbe4ad9dacbfe6aa41138ec68540cc7 (diff)
downloadrails-e59978aa867ef07e16ad64f73f1ed5cafa98d0ea.tar.gz
rails-e59978aa867ef07e16ad64f73f1ed5cafa98d0ea.tar.bz2
rails-e59978aa867ef07e16ad64f73f1ed5cafa98d0ea.zip
MySQL: omit text/blob defaults from the schema instead of using an empty string. Closes #10963.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8757 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/mysql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 04869bd925..08d29419a5 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -94,7 +94,7 @@ module ActiveRecord
def extract_default(default)
if type == :binary || type == :text
if default.blank?
- default
+ nil
else
raise ArgumentError, "#{type} columns cannot have a default value: #{default.inspect}"
end