diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-03 19:12:20 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-03 19:12:20 -0700 |
| commit | 9df30839267c327ee4cad9808bfb7c694c20abac (patch) | |
| tree | c8e1b4fe5e1c293bf357d064ef3ed0b0839341be /activerecord/test | |
| parent | 8ee91d4051e679d6d6bbb6252796bbedde7d782c (diff) | |
| parent | c7f8019bff16554095ff5c2c4e539962922b7a55 (diff) | |
| download | rails-9df30839267c327ee4cad9808bfb7c694c20abac.tar.gz rails-9df30839267c327ee4cad9808bfb7c694c20abac.tar.bz2 rails-9df30839267c327ee4cad9808bfb7c694c20abac.zip | |
Merge pull request #23458 from kamipo/activerecord_supports_mysql_5.0_and_up
Active Record supports MySQL >= 5.0
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/defaults_test.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb index 69b0487dd8..067513e24c 100644 --- a/activerecord/test/cases/defaults_test.rb +++ b/activerecord/test/cases/defaults_test.rb @@ -201,8 +201,7 @@ if current_adapter?(:Mysql2Adapter) assert_equal '0', klass.columns_hash['zero'].default assert !klass.columns_hash['zero'].null - # 0 in MySQL 4, nil in 5. - assert [0, nil].include?(klass.columns_hash['omit'].default) + assert_equal nil, klass.columns_hash['omit'].default assert !klass.columns_hash['omit'].null assert_raise(ActiveRecord::StatementInvalid) { klass.create! } |