From 30f666f87ab873258b797b39f29cf852f7621bea Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Tue, 29 Jan 2019 04:49:45 +0900 Subject: Apply `t.timestamps` changes in Action Text and Action Mailbox Follow up #34956. --- .../migrate/20180917164000_create_action_mailbox_tables.rb | 6 +----- .../migrate/20180208205311_create_action_mailbox_tables.rb | 13 ------------- .../migrate/20180917164000_create_action_mailbox_tables.rb | 13 +++++++++++++ 3 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailbox_tables.rb create mode 100644 actionmailbox/test/dummy/db/migrate/20180917164000_create_action_mailbox_tables.rb (limited to 'actionmailbox') diff --git a/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb b/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb index 89ab66c1a9..2bf4335808 100644 --- a/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb +++ b/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb @@ -5,11 +5,7 @@ class CreateActionMailboxTables < ActiveRecord::Migration[6.0] t.string :message_id, null: false t.string :message_checksum, null: false - if supports_datetime_with_precision? - t.timestamps precision: 6 - else - t.timestamps - end + t.timestamps 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 deleted file mode 100644 index 2bf4335808..0000000000 --- a/actionmailbox/test/dummy/db/migrate/20180208205311_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/actionmailbox/test/dummy/db/migrate/20180917164000_create_action_mailbox_tables.rb b/actionmailbox/test/dummy/db/migrate/20180917164000_create_action_mailbox_tables.rb new file mode 100644 index 0000000000..2bf4335808 --- /dev/null +++ b/actionmailbox/test/dummy/db/migrate/20180917164000_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 -- cgit v1.2.3