From f6cdc2fd2f50224fb7dd31d3ccb374cf4ffe7b6d Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 23 Sep 2017 10:30:23 -0400
Subject: 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.
---
 .../20170917002857_create_pokeviewer_revisions.rb  | 31 -------------
 ...70917011258_create_pokeviewer_revision_moves.rb | 20 ---------
 .../20170917011258_create_pokeviewer_revisions.rb  | 51 ++++++++++++++++++++++
 3 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 db/migrate/20170917002857_create_pokeviewer_revisions.rb
 delete mode 100644 db/migrate/20170917011258_create_pokeviewer_revision_moves.rb
 create mode 100644 db/migrate/20170917011258_create_pokeviewer_revisions.rb

(limited to 'db')

diff --git a/db/migrate/20170917002857_create_pokeviewer_revisions.rb b/db/migrate/20170917002857_create_pokeviewer_revisions.rb
deleted file mode 100644
index f6755da..0000000
--- a/db/migrate/20170917002857_create_pokeviewer_revisions.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class CreatePokeviewerRevisions < ActiveRecord::Migration[5.1]
-  def change
-    create_table :pokeviewer_revisions do |t|
-      t.references :pokemon, null: false
-      t.integer :sequential_id, null: false
-      t.string :nickname, null: false
-      t.integer :experience, null: false
-      t.integer :level, null: false
-      t.integer :hp, null: false
-      t.integer :attack, null: false
-      t.integer :defense, null: false
-      t.integer :special_attack, null: false
-      t.integer :special_defense, null: false
-      t.integer :speed, null: false
-      t.integer :coolness, null: false
-      t.integer :beauty, null: false
-      t.integer :cuteness, null: false
-      t.integer :smartness, null: false
-      t.integer :toughness, null: false
-      t.integer :sheen, null: false
-      t.integer :hold_item, null: true
-
-      t.timestamps
-    end
-
-    add_index :pokeviewer_revisions, [:pokemon_id, :sequential_id], unique: true
-
-    add_foreign_key :pokeviewer_revisions, :pokewalker_pokemon,
-      column: :pokemon_id
-  end
-end
diff --git a/db/migrate/20170917011258_create_pokeviewer_revision_moves.rb b/db/migrate/20170917011258_create_pokeviewer_revision_moves.rb
deleted file mode 100644
index e061207..0000000
--- a/db/migrate/20170917011258_create_pokeviewer_revision_moves.rb
+++ /dev/null
@@ -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
diff --git a/db/migrate/20170917011258_create_pokeviewer_revisions.rb b/db/migrate/20170917011258_create_pokeviewer_revisions.rb
new file mode 100644
index 0000000..faa3532
--- /dev/null
+++ b/db/migrate/20170917011258_create_pokeviewer_revisions.rb
@@ -0,0 +1,51 @@
+class CreatePokeviewerRevisions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :pokeviewer_revisions do |t|
+      t.references :pokemon, null: false
+      t.integer :sequential_id, null: false
+      t.string :nickname, null: false
+      t.integer :experience, null: false
+      t.integer :level, null: false
+      t.integer :hp, null: false
+      t.integer :attack, null: false
+      t.integer :defense, null: false
+      t.integer :special_attack, null: false
+      t.integer :special_defense, null: false
+      t.integer :speed, null: false
+      t.integer :coolness, null: false
+      t.integer :beauty, null: false
+      t.integer :cuteness, null: false
+      t.integer :smartness, null: false
+      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
+
+    add_index :pokeviewer_revisions, [:pokemon_id, :sequential_id], unique: true
+
+    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
-- 
cgit 1.4.1