From b8baa15adb1eccb49d2cfa16616e24095a012ba5 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Tue, 29 Jan 2019 06:37:42 +0900 Subject: Revert "Apply `t.timestamps` changes in Action Text and Action Mailbox" This reverts commit 30f666f87ab873258b797b39f29cf852f7621bea. --- .../migrate/20180917164000_create_action_mailbox_tables.rb | 6 +++++- .../migrate/20180208205311_create_action_mailbox_tables.rb | 13 +++++++++++++ .../migrate/20180917164000_create_action_mailbox_tables.rb | 13 ------------- .../db/migrate/201805281641_create_action_text_tables.rb | 3 ++- .../db/migrate/201805281641_create_action_text_tables.rb | 13 ------------- .../db/migrate/2018052816_create_action_text_tables.rb | 13 +++++++++++++ 6 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailbox_tables.rb delete mode 100644 actionmailbox/test/dummy/db/migrate/20180917164000_create_action_mailbox_tables.rb delete mode 100644 actiontext/test/dummy/db/migrate/201805281641_create_action_text_tables.rb create mode 100644 actiontext/test/dummy/db/migrate/2018052816_create_action_text_tables.rb diff --git a/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb b/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb index 2bf4335808..89ab66c1a9 100644 --- a/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb +++ b/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb @@ -5,7 +5,11 @@ class CreateActionMailboxTables < ActiveRecord::Migration[6.0] t.string :message_id, null: false t.string :message_checksum, null: false - t.timestamps + if supports_datetime_with_precision? + t.timestamps precision: 6 + else + t.timestamps + end t.index [ :message_id, :message_checksum ], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true end diff --git a/actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailbox_tables.rb b/actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailbox_tables.rb new file mode 100644 index 0000000000..2bf4335808 --- /dev/null +++ b/actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailbox_tables.rb @@ -0,0 +1,13 @@ +class CreateActionMailboxTables < ActiveRecord::Migration[6.0] + def change + create_table :action_mailbox_inbound_emails do |t| + t.integer :status, default: 0, null: false + t.string :message_id, null: false + t.string :message_checksum, null: false + + t.timestamps + + t.index [ :message_id, :message_checksum ], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true + end + end +end diff --git a/actionmailbox/test/dummy/db/migrate/20180917164000_create_action_mailbox_tables.rb b/actionmailbox/test/dummy/db/migrate/20180917164000_create_action_mailbox_tables.rb deleted file mode 100644 index 2bf4335808..0000000000 --- a/actionmailbox/test/dummy/db/migrate/20180917164000_create_action_mailbox_tables.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateActionMailboxTables < ActiveRecord::Migration[6.0] - def change - create_table :action_mailbox_inbound_emails do |t| - t.integer :status, default: 0, null: false - t.string :message_id, null: false - t.string :message_checksum, null: false - - t.timestamps - - t.index [ :message_id, :message_checksum ], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true - end - end -end diff --git a/actiontext/db/migrate/201805281641_create_action_text_tables.rb b/actiontext/db/migrate/201805281641_create_action_text_tables.rb index 6e7177620f..74c7a0ecb9 100644 --- a/actiontext/db/migrate/201805281641_create_action_text_tables.rb +++ b/actiontext/db/migrate/201805281641_create_action_text_tables.rb @@ -5,7 +5,8 @@ class CreateActionTextTables < ActiveRecord::Migration[6.0] t.text :body, limit: 16777215 t.references :record, null: false, polymorphic: true, index: false - t.timestamps + t.datetime :created_at, null: false + t.datetime :updated_at, null: false t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true end diff --git a/actiontext/test/dummy/db/migrate/201805281641_create_action_text_tables.rb b/actiontext/test/dummy/db/migrate/201805281641_create_action_text_tables.rb deleted file mode 100644 index 6e7177620f..0000000000 --- a/actiontext/test/dummy/db/migrate/201805281641_create_action_text_tables.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateActionTextTables < ActiveRecord::Migration[6.0] - def change - create_table :action_text_rich_texts do |t| - t.string :name, null: false - t.text :body, limit: 16777215 - t.references :record, null: false, polymorphic: true, index: false - - t.timestamps - - t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true - end - end -end diff --git a/actiontext/test/dummy/db/migrate/2018052816_create_action_text_tables.rb b/actiontext/test/dummy/db/migrate/2018052816_create_action_text_tables.rb new file mode 100644 index 0000000000..6e7177620f --- /dev/null +++ b/actiontext/test/dummy/db/migrate/2018052816_create_action_text_tables.rb @@ -0,0 +1,13 @@ +class CreateActionTextTables < ActiveRecord::Migration[6.0] + def change + create_table :action_text_rich_texts do |t| + t.string :name, null: false + t.text :body, limit: 16777215 + t.references :record, null: false, polymorphic: true, index: false + + t.timestamps + + t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true + end + end +end -- cgit v1.2.3