From 38e0d09c482d49179926e324481711cfac1a5ce1 Mon Sep 17 00:00:00 2001 From: Sidharth Date: Wed, 1 Aug 2018 20:36:25 +0530 Subject: [PATCH] Two migrations merged into one --- db/migrate/20180731124028_add_password_checker_to_rusers.rb | 5 ----- .../20180731170712_remove_password_checker_from_users.rb | 5 ----- ...cker_to_rusers_and_remove_password_checker_from_users.rb | 6 ++++++ db/schema.rb.example | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 db/migrate/20180731124028_add_password_checker_to_rusers.rb delete mode 100644 db/migrate/20180731170712_remove_password_checker_from_users.rb create mode 100644 db/migrate/20180801144533_add_password_checker_to_rusers_and_remove_password_checker_from_users.rb diff --git a/db/migrate/20180731124028_add_password_checker_to_rusers.rb b/db/migrate/20180731124028_add_password_checker_to_rusers.rb deleted file mode 100644 index f3ba720210..0000000000 --- a/db/migrate/20180731124028_add_password_checker_to_rusers.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddPasswordCheckerToRusers < ActiveRecord::Migration[5.2] - def change - add_column :rusers, :password_checker, :integer, default: 0 - end -end diff --git a/db/migrate/20180731170712_remove_password_checker_from_users.rb b/db/migrate/20180731170712_remove_password_checker_from_users.rb deleted file mode 100644 index 8081496eb2..0000000000 --- a/db/migrate/20180731170712_remove_password_checker_from_users.rb +++ /dev/null @@ -1,5 +0,0 @@ -class RemovePasswordCheckerFromUsers < ActiveRecord::Migration[5.2] - def change - remove_column :users, :password_checker, :integer - end -end diff --git a/db/migrate/20180801144533_add_password_checker_to_rusers_and_remove_password_checker_from_users.rb b/db/migrate/20180801144533_add_password_checker_to_rusers_and_remove_password_checker_from_users.rb new file mode 100644 index 0000000000..96b09b4950 --- /dev/null +++ b/db/migrate/20180801144533_add_password_checker_to_rusers_and_remove_password_checker_from_users.rb @@ -0,0 +1,6 @@ +class AddPasswordCheckerToRusersAndRemovePasswordCheckerFromUsers < ActiveRecord::Migration[5.2] + def change + remove_column :users, :password_checker, :integer + add_column :rusers, :password_checker, :integer, default: 0 + end +end diff --git a/db/schema.rb.example b/db/schema.rb.example index 9859b4cda4..e6f5f97c5d 100644 --- a/db/schema.rb.example +++ b/db/schema.rb.example @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_07_31_170712) do +ActiveRecord::Schema.define(version: 2018_08_01_144533) do create_table "answer_selections", force: true do |t| t.integer "user_id"