aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/mysql
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-11-20 15:30:46 +0100
committerYves Senn <yves.senn@gmail.com>2014-11-20 15:30:46 +0100
commitd56be864f61cc00eeff27ed42e7cec4194c5347f (patch)
tree82ee21eb30e8de1dc9b7cfc329b6ea5ed34676ea /activerecord/test/cases/adapters/mysql
parent7839e27b4e467b5cf94e83555b9b6f0a4f6aaf8a (diff)
downloadrails-d56be864f61cc00eeff27ed42e7cec4194c5347f.tar.gz
rails-d56be864f61cc00eeff27ed42e7cec4194c5347f.tar.bz2
rails-d56be864f61cc00eeff27ed42e7cec4194c5347f.zip
synchronize code and docs for `timestamps` and `add_timestamps`.
This makes the following changes: * warn if `:null` is not passed to `add_timestamps` * `timestamps` method docs link to `add_timestamps` docs * explain where additional options go * adjust examples to include `null: false` (to prevent deprecation warnings)
Diffstat (limited to 'activerecord/test/cases/adapters/mysql')
-rw-r--r--activerecord/test/cases/adapters/mysql/active_schema_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql/active_schema_test.rb b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
index a84673e452..413f67da26 100644
--- a/activerecord/test/cases/adapters/mysql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
@@ -92,7 +92,7 @@ class ActiveSchemaTest < ActiveRecord::TestCase
with_real_execute do
begin
ActiveRecord::Base.connection.create_table :delete_me
- ActiveRecord::Base.connection.add_timestamps :delete_me
+ ActiveRecord::Base.connection.add_timestamps :delete_me, null: true
assert column_present?('delete_me', 'updated_at', 'datetime')
assert column_present?('delete_me', 'created_at', 'datetime')
ensure