From 05cb53302269d0e18ec3321f52f8cfc2db05464e Mon Sep 17 00:00:00 2001 From: David Cliff Date: Wed, 16 Jan 2019 13:06:22 -0500 Subject: [PATCH] Migration fix for PG --- Gemfile.lock | 2 +- ...181218183728_create_minerva_assignments.rb | 4 +- .../20181218183815_create_minerva_states.rb | 9 +- lib/minerva/version.rb | 2 +- test/dummy/db/schema.rb | 94 ------------------- 5 files changed, 12 insertions(+), 99 deletions(-) delete mode 100644 test/dummy/db/schema.rb diff --git a/Gemfile.lock b/Gemfile.lock index a2da31f..ab74d9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - minerva (0.1.19) + minerva (0.1.20) rails (> 5.2) GEM diff --git a/db/migrate/20181218183728_create_minerva_assignments.rb b/db/migrate/20181218183728_create_minerva_assignments.rb index f01627a..7861cc0 100644 --- a/db/migrate/20181218183728_create_minerva_assignments.rb +++ b/db/migrate/20181218183728_create_minerva_assignments.rb @@ -2,10 +2,12 @@ class CreateMinervaAssignments < ActiveRecord::Migration[5.2] def change create_table :minerva_assignments do |t| t.string :title - t.references :interface, foreign_key: true t.boolean :automated + t.integer :interface_id t.timestamps end + add_foreign_key :minerva_assignments, :minerva_interfaces, column: :interface_id + add_index :minerva_assignments, :interface_id end end diff --git a/db/migrate/20181218183815_create_minerva_states.rb b/db/migrate/20181218183815_create_minerva_states.rb index f7f1baa..fee6e9d 100644 --- a/db/migrate/20181218183815_create_minerva_states.rb +++ b/db/migrate/20181218183815_create_minerva_states.rb @@ -5,8 +5,8 @@ def change t.integer :user_id t.integer :role_id t.integer :work_id - t.references :assignment, foreign_key: true - t.references :status, foreign_key: true + t.integer :minerva_assignment_id + t.integer :minerva_status_id t.timestamps end @@ -14,5 +14,10 @@ def change add_index :minerva_states, :user_id add_index :minerva_states, :role_id add_index :minerva_states, :work_id + + add_foreign_key :minerva_states, :minerva_assignments, column: :minerva_assignment_id + add_index :minerva_states, :minerva_assignment_id + add_foreign_key :minerva_states, :minerva_statuses, column: :minerva_status_id + add_index :minerva_states, :minerva_status_id end end diff --git a/lib/minerva/version.rb b/lib/minerva/version.rb index bf84036..82b8b3c 100644 --- a/lib/minerva/version.rb +++ b/lib/minerva/version.rb @@ -1,3 +1,3 @@ module Minerva - VERSION = '0.1.19' + VERSION = '0.1.20' end diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb deleted file mode 100644 index 61354d6..0000000 --- a/test/dummy/db/schema.rb +++ /dev/null @@ -1,94 +0,0 @@ -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 2019_01_07_173209) do - - create_table "minerva_assignments", force: :cascade do |t| - t.string "title" - t.integer "interface_id" - t.boolean "automated" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["interface_id"], name: "index_minerva_assignments_on_interface_id" - end - - create_table "minerva_interfaces", force: :cascade do |t| - t.string "title" - t.string "code_point" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - create_table "minerva_projects", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "auid", null: false - t.index ["auid"], name: "index_minerva_projects_on_auid", unique: true - end - - create_table "minerva_roles", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "auid", null: false - t.index ["auid"], name: "index_minerva_roles_on_auid", unique: true - end - - create_table "minerva_states", force: :cascade do |t| - t.integer "creator_id" - t.integer "user_id" - t.integer "role_id" - t.integer "work_id" - t.integer "assignment_id" - t.integer "status_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["assignment_id"], name: "index_minerva_states_on_assignment_id" - t.index ["creator_id"], name: "index_minerva_states_on_creator_id" - t.index ["role_id"], name: "index_minerva_states_on_role_id" - t.index ["status_id"], name: "index_minerva_states_on_status_id" - t.index ["user_id"], name: "index_minerva_states_on_user_id" - t.index ["work_id"], name: "index_minerva_states_on_work_id" - end - - create_table "minerva_statuses", force: :cascade do |t| - t.string "title" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - create_table "minerva_users", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "auid", null: false - t.index ["auid"], name: "index_minerva_users_on_auid", unique: true - end - - create_table "minerva_workflows", force: :cascade do |t| - t.integer "creator_id" - t.integer "project_id" - t.text "task_list" - t.string "title" - t.boolean "ordered" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["creator_id"], name: "index_minerva_workflows_on_creator_id" - t.index ["project_id"], name: "index_minerva_workflows_on_project_id" - end - - create_table "minerva_works", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "auid", null: false - t.index ["auid"], name: "index_minerva_works_on_auid", unique: true - end - -end