Moved revision moves into revision table

This is a retroactive schema change, so there's no easy way to migrate
into it without losing data, but this is so early into the development
of this project that it really doesn't matter.

2 files changed, 20 insertions, 20 deletions

@@ -1,20 +0,0 @@
-class CreatePokeviewerRevisionMoves < ActiveRecord::Migration[5.1]
-  def change
-    create_table :pokeviewer_revision_moves do |t|
-      t.references :revision, null: false
-      t.references :move, null: false
-      t.integer :number, null: false
-      t.integer :pp_bonuses, null: false, default: 0
-
-      t.timestamps
-    end
-
-    add_index :pokeviewer_revision_moves, [:revision_id, :number], unique: true
-
-    add_foreign_key :pokeviewer_revision_moves, :pokeviewer_revisions,
-      column: :revision_id
-
-    add_foreign_key :pokeviewer_revision_moves, :pokeviewer_moves,
-      column: :move_id
-  end
-end
@@ -19,6 +19,14 @@ class CreatePokeviewerRevisions < ActiveRecord::Migration[5.1]
       t.integer :toughness, null: false
       t.integer :sheen, null: false
       t.integer :hold_item, null: true
+      t.references :move_1, null: false
+      t.references :move_2, null: true
+      t.references :move_3, null: true
+      t.references :move_4, null: true
+      t.integer :move_1_pp_bonuses, null: false, default: 0
+      t.integer :move_2_pp_bonuses, null: false, default: 0
+      t.integer :move_3_pp_bonuses, null: false, default: 0
+      t.integer :move_4_pp_bonuses, null: false, default: 0
 
       t.timestamps
     end
@@ -27,5 +35,17 @@ class CreatePokeviewerRevisions < ActiveRecord::Migration[5.1]
 
     add_foreign_key :pokeviewer_revisions, :pokewalker_pokemon,
       column: :pokemon_id
+
+    add_foreign_key :pokeviewer_revisions, :pokewalker_moves,
+      column: :move_1_id
+
+    add_foreign_key :pokeviewer_revisions, :pokewalker_moves,
+      column: :move_2_id
+
+    add_foreign_key :pokeviewer_revisions, :pokewalker_moves,
+      column: :move_3_id
+
+    add_foreign_key :pokeviewer_revisions, :pokewalker_moves,
+      column: :move_4_id
   end
 end