From a273f1cd3e7e3ccbc420a1dd3b507dc372cf286a Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 15 Oct 2017 14:33:56 -0400 Subject: Fixed two more migrations, similar to previous --- db/migrate/20171003154157_rename_pokemon_met_location.rb | 4 +++- db/migrate/20171011015648_add_type_and_ability_to_species.rb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'db') diff --git a/db/migrate/20171003154157_rename_pokemon_met_location.rb b/db/migrate/20171003154157_rename_pokemon_met_location.rb index 4ccba57..3d42d53 100644 --- a/db/migrate/20171003154157_rename_pokemon_met_location.rb +++ b/db/migrate/20171003154157_rename_pokemon_met_location.rb @@ -1,6 +1,8 @@ class RenamePokemonMetLocation < ActiveRecord::Migration[5.1] def up - add_column :pokeviewer_pokemon, :location_id, :integer, null: true + change_table :pokeviewer_pokemon do |t| + t.references :location, null: true + end add_foreign_key :pokeviewer_pokemon, :pokeviewer_locations, column: :location_id diff --git a/db/migrate/20171011015648_add_type_and_ability_to_species.rb b/db/migrate/20171011015648_add_type_and_ability_to_species.rb index d7d274e..3c24c1b 100644 --- a/db/migrate/20171011015648_add_type_and_ability_to_species.rb +++ b/db/migrate/20171011015648_add_type_and_ability_to_species.rb @@ -3,8 +3,8 @@ class AddTypeAndAbilityToSpecies < ActiveRecord::Migration[5.1] change_table :pokeviewer_species do |t| t.string :type_1, null: false, default: "" t.string :type_2 - t.integer :ability_1_id, null: false, default: 0 - t.integer :ability_2_id + t.references :ability_1, null: false, default: 0 + t.references :ability_2 end change_column_default :pokeviewer_species, :type_1, nil -- cgit 1.4.1