From e44349d1c1c7547328840cf090adb219c384d28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Fri, 3 Feb 2017 18:12:32 +0100 Subject: [PATCH] adds poll_white_results and poll_blank_results --- ...0170203163304_create_poll_white_results.rb | 18 +++++++++++ ...20170203163317_create_poll_null_results.rb | 18 +++++++++++ db/schema.rb | 32 ++++++++++++++++++- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20170203163304_create_poll_white_results.rb create mode 100644 db/migrate/20170203163317_create_poll_null_results.rb diff --git a/db/migrate/20170203163304_create_poll_white_results.rb b/db/migrate/20170203163304_create_poll_white_results.rb new file mode 100644 index 000000000..2ebfc93b1 --- /dev/null +++ b/db/migrate/20170203163304_create_poll_white_results.rb @@ -0,0 +1,18 @@ +class CreatePollWhiteResults < ActiveRecord::Migration + def change + create_table :poll_white_results 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_white_results, :officer_assignment_id + add_index :poll_white_results, :booth_assignment_id + end +end diff --git a/db/migrate/20170203163317_create_poll_null_results.rb b/db/migrate/20170203163317_create_poll_null_results.rb new file mode 100644 index 000000000..9c138cf65 --- /dev/null +++ b/db/migrate/20170203163317_create_poll_null_results.rb @@ -0,0 +1,18 @@ +class CreatePollNullResults < ActiveRecord::Migration + def change + create_table :poll_null_results 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_null_results, :officer_assignment_id + add_index :poll_null_results, :booth_assignment_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 95028b472..b44907334 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: 20170202151151) do +ActiveRecord::Schema.define(version: 20170203163317) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -411,6 +411,21 @@ ActiveRecord::Schema.define(version: 20170202151151) do add_index "poll_final_recounts", ["booth_assignment_id"], name: "index_poll_final_recounts_on_booth_assignment_id", using: :btree + create_table "poll_null_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_null_results", ["booth_assignment_id"], name: "index_poll_null_results_on_booth_assignment_id", using: :btree + add_index "poll_null_results", ["officer_assignment_id"], name: "index_poll_null_results_on_officer_assignment_id", using: :btree + create_table "poll_officer_assignments", force: :cascade do |t| t.integer "booth_assignment_id" t.integer "officer_id" @@ -498,6 +513,21 @@ ActiveRecord::Schema.define(version: 20170202151151) do add_index "poll_voters", ["poll_id"], name: "index_poll_voters_on_poll_id", using: :btree add_index "poll_voters", ["user_id"], name: "index_poll_voters_on_user_id", using: :btree + create_table "poll_white_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_white_results", ["booth_assignment_id"], name: "index_poll_white_results_on_booth_assignment_id", using: :btree + add_index "poll_white_results", ["officer_assignment_id"], name: "index_poll_white_results_on_officer_assignment_id", using: :btree + create_table "polls", force: :cascade do |t| t.string "name" t.datetime "starts_at"