aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2007-09-05 05:38:19 +0000
committerMichael Koziarski <michael@koziarski.com>2007-09-05 05:38:19 +0000
commit0d696f09ac5c5106d4343d6a2add565620b2b45c (patch)
tree336efc67f06927800f5d4f8a872cf4990a738815 /activerecord
parentaa32f66ebba1172ea006ee815df396152cacdffe (diff)
downloadrails-0d696f09ac5c5106d4343d6a2add565620b2b45c.tar.gz
rails-0d696f09ac5c5106d4343d6a2add565620b2b45c.tar.bz2
rails-0d696f09ac5c5106d4343d6a2add565620b2b45c.zip
Fix assertion for the mysql default work around committed earlier.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7408 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/migration_test.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/test/migration_test.rb b/activerecord/test/migration_test.rb
index 727ce86d30..dec126bd45 100644
--- a/activerecord/test/migration_test.rb
+++ b/activerecord/test/migration_test.rb
@@ -748,7 +748,11 @@ if ActiveRecord::Base.connection.supports_migrations?
columns = Person.connection.columns(:binary_testings)
data_column = columns.detect { |c| c.name == "data" }
- assert_equal '', data_column.default
+ if current_adapter?(:MysqlAdapter)
+ assert_equal '', data_column.default
+ else
+ assert_nil data_column.default
+ end
Person.connection.drop_table :binary_testings rescue nil
end