diff --git a/db/migrate/20150827080624_rename_inappropiate_flags_as_flags.rb b/db/migrate/20150827080624_rename_inappropiate_flags_as_flags.rb new file mode 100644 index 000000000..26058bde0 --- /dev/null +++ b/db/migrate/20150827080624_rename_inappropiate_flags_as_flags.rb @@ -0,0 +1,5 @@ +class RenameInappropiateFlagsAsFlags < ActiveRecord::Migration + def change + rename_table :inappropiate_flags, :flags + end +end diff --git a/db/migrate/20150827080641_rename_archived_at_to_flag_ignored_at_in_comments_and_debates.rb b/db/migrate/20150827080641_rename_archived_at_to_flag_ignored_at_in_comments_and_debates.rb new file mode 100644 index 000000000..7328ca79b --- /dev/null +++ b/db/migrate/20150827080641_rename_archived_at_to_flag_ignored_at_in_comments_and_debates.rb @@ -0,0 +1,6 @@ +class RenameArchivedAtToFlagIgnoredAtInCommentsAndDebates < ActiveRecord::Migration + def change + rename_column :comments, :archived_at, :flag_ignored_at + rename_column :debates, :archived_at, :flag_ignored_at + end +end diff --git a/db/migrate/20150827080701_add_hide_reviewed_at_to_comments_and_debates.rb b/db/migrate/20150827080701_add_hide_reviewed_at_to_comments_and_debates.rb new file mode 100644 index 000000000..dfcef9f06 --- /dev/null +++ b/db/migrate/20150827080701_add_hide_reviewed_at_to_comments_and_debates.rb @@ -0,0 +1,6 @@ +class AddHideReviewedAtToCommentsAndDebates < ActiveRecord::Migration + def change + add_column :debates, :hide_reviewed_at, :datetime + add_column :comments, :hide_reviewed_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index ad2a412ff..29084fe08 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: 20150826112500) do +ActiveRecord::Schema.define(version: 20150827080701) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,7 +41,7 @@ ActiveRecord::Schema.define(version: 20150826112500) do t.string "title" t.text "body" t.string "subject" - t.integer "user_id", null: false + t.integer "user_id", null: false t.integer "parent_id" t.integer "lft" t.integer "rgt" @@ -51,12 +51,13 @@ ActiveRecord::Schema.define(version: 20150826112500) do t.datetime "hidden_at" t.datetime "flagged_as_inappropiate_at" t.integer "inappropiate_flags_count", default: 0 - t.datetime "archived_at" + t.datetime "flag_ignored_at" t.integer "moderator_id" t.integer "administrator_id" t.integer "cached_votes_total", default: 0 t.integer "cached_votes_up", default: 0 t.integer "cached_votes_down", default: 0 + t.datetime "hide_reviewed_at" end add_index "comments", ["cached_votes_down"], name: "index_comments_on_cached_votes_down", using: :btree @@ -70,8 +71,8 @@ ActiveRecord::Schema.define(version: 20150826112500) do t.string "title", limit: 80 t.text "description" t.integer "author_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.datetime "hidden_at" t.string "visit_id" t.datetime "flagged_as_inappropiate_at" @@ -79,8 +80,9 @@ ActiveRecord::Schema.define(version: 20150826112500) do t.integer "cached_votes_total", default: 0 t.integer "cached_votes_up", default: 0 t.integer "cached_votes_down", default: 0 - t.datetime "archived_at" + t.datetime "flag_ignored_at" t.integer "comments_count", default: 0 + t.datetime "hide_reviewed_at" end add_index "debates", ["cached_votes_down"], name: "index_debates_on_cached_votes_down", using: :btree @@ -88,6 +90,18 @@ ActiveRecord::Schema.define(version: 20150826112500) do add_index "debates", ["cached_votes_up"], name: "index_debates_on_cached_votes_up", using: :btree add_index "debates", ["hidden_at"], name: "index_debates_on_hidden_at", using: :btree + create_table "flags", force: :cascade do |t| + t.integer "user_id" + t.string "flaggable_type" + t.integer "flaggable_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "flags", ["flaggable_type", "flaggable_id"], name: "index_flags_on_flaggable_type_and_flaggable_id", using: :btree + add_index "flags", ["user_id", "flaggable_type", "flaggable_id"], name: "access_inappropiate_flags", using: :btree + add_index "flags", ["user_id"], name: "index_flags_on_user_id", using: :btree + create_table "identities", force: :cascade do |t| t.integer "user_id" t.string "provider" @@ -98,18 +112,6 @@ ActiveRecord::Schema.define(version: 20150826112500) do add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree - create_table "inappropiate_flags", force: :cascade do |t| - t.integer "user_id" - t.string "flaggable_type" - t.integer "flaggable_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "inappropiate_flags", ["flaggable_type", "flaggable_id"], name: "index_inappropiate_flags_on_flaggable_type_and_flaggable_id", using: :btree - add_index "inappropiate_flags", ["user_id", "flaggable_type", "flaggable_id"], name: "access_inappropiate_flags", using: :btree - add_index "inappropiate_flags", ["user_id"], name: "index_inappropiate_flags_on_user_id", using: :btree - create_table "moderators", force: :cascade do |t| t.integer "user_id" end @@ -237,8 +239,8 @@ ActiveRecord::Schema.define(version: 20150826112500) do add_index "votes", ["voter_id", "voter_type", "vote_scope"], name: "index_votes_on_voter_id_and_voter_type_and_vote_scope", using: :btree add_foreign_key "administrators", "users" + add_foreign_key "flags", "users" add_foreign_key "identities", "users" - add_foreign_key "inappropiate_flags", "users" add_foreign_key "moderators", "users" add_foreign_key "organizations", "users" -end \ No newline at end of file +end