diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-01-26 20:56:10 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2019-01-26 21:19:20 +0900 |
| commit | 5fe6d3747efd37d7d8c6c9d6557d7b623e0398e8 (patch) | |
| tree | 2aa826cf2fbd300e746b0f3e70c60f682d1b01aa /activerecord/lib | |
| parent | 17901d876460f013c22dd155a148bbf7671433e2 (diff) | |
| download | rails-5fe6d3747efd37d7d8c6c9d6557d7b623e0398e8.tar.gz rails-5fe6d3747efd37d7d8c6c9d6557d7b623e0398e8.tar.bz2 rails-5fe6d3747efd37d7d8c6c9d6557d7b623e0398e8.zip | |
Fix `t.timestamps` missing `null: false` in `change_table bulk: true`
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 5479ddab71..ce2a1737f9 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -709,6 +709,8 @@ module ActiveRecord end def add_timestamps_for_alter(table_name, options = {}) + options[:null] = false if options[:null].nil? + [add_column_for_alter(table_name, :created_at, :datetime, options), add_column_for_alter(table_name, :updated_at, :datetime, options)] end diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb index 7cf371be68..9c44cf46aa 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -716,6 +716,8 @@ module ActiveRecord end def add_timestamps_for_alter(table_name, options = {}) + options[:null] = false if options[:null].nil? + [add_column_for_alter(table_name, :created_at, :datetime, options), add_column_for_alter(table_name, :updated_at, :datetime, options)] end |