diff options
author | David Heinemeier Hansson <david@basecamp.com> | 2014-08-17 18:12:52 -0700 |
---|---|---|
committer | David Heinemeier Hansson <david@basecamp.com> | 2014-08-17 18:12:52 -0700 |
commit | 7ee055076ec2c5b2e9c110f821c10fe06bf38a1c (patch) | |
tree | de7578ca9afadfb05ea45134c2ae1d053aba0d26 /activerecord/test/cases/migration | |
parent | eced6f81184a67fc47ecb78e802d82a7234ae23d (diff) | |
parent | ea3ba34506c72d636096245016b5ef9cfe27c566 (diff) | |
download | rails-7ee055076ec2c5b2e9c110f821c10fe06bf38a1c.tar.gz rails-7ee055076ec2c5b2e9c110f821c10fe06bf38a1c.tar.bz2 rails-7ee055076ec2c5b2e9c110f821c10fe06bf38a1c.zip |
Merge pull request #16481 from sgrif/sg-change-default-timestamps
Change the default `null` value for timestamps
Diffstat (limited to 'activerecord/test/cases/migration')
-rw-r--r-- | activerecord/test/cases/migration/change_schema_test.rb | 7 | ||||
-rw-r--r-- | activerecord/test/cases/migration/change_table_test.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/migration/helper.rb | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb index c66eaf1ee1..bd3dd29f4d 100644 --- a/activerecord/test/cases/migration/change_schema_test.rb +++ b/activerecord/test/cases/migration/change_schema_test.rb @@ -176,8 +176,11 @@ module ActiveRecord end def test_create_table_with_timestamps_should_create_datetime_columns - connection.create_table table_name do |t| - t.timestamps + # FIXME: Remove the silence when we change the default `null` behavior + ActiveSupport::Deprecation.silence do + connection.create_table table_name do |t| + t.timestamps + end end created_columns = connection.columns(table_name) diff --git a/activerecord/test/cases/migration/change_table_test.rb b/activerecord/test/cases/migration/change_table_test.rb index 3e9d957ed3..777a48ad14 100644 --- a/activerecord/test/cases/migration/change_table_test.rb +++ b/activerecord/test/cases/migration/change_table_test.rb @@ -88,8 +88,8 @@ module ActiveRecord def test_timestamps_creates_updated_at_and_created_at with_change_table do |t| - @connection.expect :add_timestamps, nil, [:delete_me] - t.timestamps + @connection.expect :add_timestamps, nil, [:delete_me, null: true] + t.timestamps null: true end end diff --git a/activerecord/test/cases/migration/helper.rb b/activerecord/test/cases/migration/helper.rb index e28feedcf9..4dad77e8fd 100644 --- a/activerecord/test/cases/migration/helper.rb +++ b/activerecord/test/cases/migration/helper.rb @@ -22,7 +22,7 @@ module ActiveRecord super @connection = ActiveRecord::Base.connection connection.create_table :test_models do |t| - t.timestamps + t.timestamps null: true end TestModel.reset_column_information |