Two migrations merged into one

publiclab · Aug 1, 2018 · 38e0d09 · 38e0d09
1 parent 44ada75
commit 38e0d09
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/db/migrate/20180731124028_add_password_checker_to_rusers.rb b/db/migrate/20180731124028_add_password_checker_to_rusers.rb
diff --git a/db/migrate/20180731170712_remove_password_checker_from_users.rb b/db/migrate/20180731170712_remove_password_checker_from_users.rb
diff --git a/...e/20180801144533_add_password_checker_to_rusers_and_remove_password_checker_from_users.rb b/...e/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
@@ -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"