From f3229007e8ba0c0853ea4b03b2bc8df22fe301e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 21 Sep 2017 21:28:54 +0200 Subject: [PATCH] Run pending migrations --- db/schema.rb | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 41952607e..acacbf347 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: 20170915101519) do +ActiveRecord::Schema.define(version: 20170918231410) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -620,20 +620,6 @@ ActiveRecord::Schema.define(version: 20170915101519) do t.string "location" end - create_table "poll_final_recounts", force: :cascade do |t| - t.integer "booth_assignment_id" - t.integer "officer_assignment_id" - t.integer "count" - t.text "count_log", default: "" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.text "officer_assignment_id_log", default: "" - t.date "date", null: false - end - - add_index "poll_final_recounts", ["booth_assignment_id"], name: "index_poll_final_recounts_on_booth_assignment_id", using: :btree - add_index "poll_final_recounts", ["officer_assignment_id"], name: "index_poll_final_recounts_on_officer_assignment_id", using: :btree - create_table "poll_null_results", force: :cascade do |t| t.integer "author_id" t.integer "amount" @@ -725,6 +711,21 @@ ActiveRecord::Schema.define(version: 20170915101519) do add_index "poll_shifts", ["booth_id"], name: "index_poll_shifts_on_booth_id", using: :btree add_index "poll_shifts", ["officer_id"], name: "index_poll_shifts_on_officer_id", using: :btree + create_table "poll_total_results", force: :cascade do |t| + t.integer "author_id" + t.integer "amount" + t.string "origin" + t.date "date" + t.integer "booth_assignment_id" + t.integer "officer_assignment_id" + t.text "amount_log", default: "" + t.text "officer_assignment_id_log", default: "" + t.text "author_id_log", default: "" + end + + add_index "poll_total_results", ["booth_assignment_id"], name: "index_poll_total_results_on_booth_assignment_id", using: :btree + add_index "poll_total_results", ["officer_assignment_id"], name: "index_poll_total_results_on_officer_assignment_id", using: :btree + create_table "poll_voters", force: :cascade do |t| t.string "document_number" t.string "document_type" @@ -1010,7 +1011,7 @@ ActiveRecord::Schema.define(version: 20170915101519) do t.boolean "email_digest", default: true t.boolean "email_on_direct_message", default: true t.boolean "official_position_badge", default: false - t.datetime "password_changed_at", default: '2017-09-06 18:19:39', null: false + t.datetime "password_changed_at", default: '2015-01-01 00:01:01', null: false t.boolean "created_from_signature", default: false t.integer "failed_email_digests_count", default: 0 t.text "former_users_data_log", default: "" @@ -1123,8 +1124,6 @@ ActiveRecord::Schema.define(version: 20170915101519) do add_foreign_key "organizations", "users" add_foreign_key "poll_answers", "poll_questions", column: "question_id" add_foreign_key "poll_booth_assignments", "polls" - add_foreign_key "poll_final_recounts", "poll_booth_assignments", column: "booth_assignment_id" - add_foreign_key "poll_final_recounts", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_null_results", "poll_booth_assignments", column: "booth_assignment_id" add_foreign_key "poll_null_results", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_officer_assignments", "poll_booth_assignments", column: "booth_assignment_id"