From a7c8f08972e2f3cd1b436ab3cc5ff19cdf096238 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Tue, 1 Mar 2016 17:57:32 +0100 Subject: [PATCH] Migrations cleaned up --- .../20150713155458_create_user_sessions.rb | 13 -------- ...20150715145131_drop_user_sessions_table.rb | 5 --- db/migrate/20150715145208_drop_users_table.rb | 5 --- db/schema.rb | 33 ++++++++----------- 4 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 db/migrate/20150713155458_create_user_sessions.rb delete mode 100644 db/migrate/20150715145131_drop_user_sessions_table.rb delete mode 100644 db/migrate/20150715145208_drop_users_table.rb diff --git a/db/migrate/20150713155458_create_user_sessions.rb b/db/migrate/20150713155458_create_user_sessions.rb deleted file mode 100644 index bc70a50..0000000 --- a/db/migrate/20150713155458_create_user_sessions.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateUserSessions < ActiveRecord::Migration - def change - create_table :user_sessions do |t| - t.string :session_id, :null => false - t.text :data - t.timestamps - end - - add_index :user_sessions, :session_id - add_index :user_sessions, :updated_at - - end -end diff --git a/db/migrate/20150715145131_drop_user_sessions_table.rb b/db/migrate/20150715145131_drop_user_sessions_table.rb deleted file mode 100644 index be6a21a..0000000 --- a/db/migrate/20150715145131_drop_user_sessions_table.rb +++ /dev/null @@ -1,5 +0,0 @@ -class DropUserSessionsTable < ActiveRecord::Migration - def change - drop_table :user_sessions - end -end diff --git a/db/migrate/20150715145208_drop_users_table.rb b/db/migrate/20150715145208_drop_users_table.rb deleted file mode 100644 index 1f07ec9..0000000 --- a/db/migrate/20150715145208_drop_users_table.rb +++ /dev/null @@ -1,5 +0,0 @@ -class DropUsersTable < ActiveRecord::Migration - def change - drop_table :users - end -end diff --git a/db/schema.rb b/db/schema.rb index 0c454ba..e04d457 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150715145517) do +ActiveRecord::Schema.define(version: 20150713153950) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -65,25 +65,20 @@ ActiveRecord::Schema.define(version: 20150715145517) do add_index "screenshots", ["id", "uploaderhash"], name: "id_uploaderhash", using: :btree create_table "users", force: :cascade do |t| - t.string "email", default: "", null: false - t.string "encrypted_password", default: "", null: false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", default: 0, null: false - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.inet "current_sign_in_ip" - t.inet "last_sign_in_ip" - t.integer "failed_attempts", default: 0, null: false - t.string "unlock_token" - t.datetime "locked_at" - t.datetime "created_at" - t.datetime "updated_at" + t.text "email" + t.text "realname" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "password_salt", null: false + t.string "persistence_token", null: false + t.integer "login_count", default: 0, null: false + t.integer "failed_login_count", default: 0, null: false + t.datetime "last_request_at" + t.datetime "current_login_at" + t.datetime "last_login_at" + t.string "current_login_ip" + t.string "last_login_ip" end - add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree - add_foreign_key "screenshots", "packages", name: "screenshots_package_id_fkey" end