From c2fe86394bac998d887c5f59b48849dc067b9e43 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sun, 15 Oct 2017 14:18:07 -0400
Subject: Fixed MySQL choking on a pokeviewer migration

See hatkirby/pokeviewer@a29b86011d9c53709279d125f4501140c17ccc1e.
---
 Gemfile.lock                                                      | 2 +-
 db/migrate/20171015171554_rename_revision_hold_item.pokeviewer.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 28066a4..108fb43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/hatkirby/pokeviewer.git
-  revision: 39a065e9cabdff4d90025ac0090b64aea6941a9d
+  revision: a29b86011d9c53709279d125f4501140c17ccc1e
   specs:
     pokeviewer (0.1.0)
       activerecord-diff
diff --git a/db/migrate/20171015171554_rename_revision_hold_item.pokeviewer.rb b/db/migrate/20171015171554_rename_revision_hold_item.pokeviewer.rb
index f7246de..d83f5e8 100644
--- a/db/migrate/20171015171554_rename_revision_hold_item.pokeviewer.rb
+++ b/db/migrate/20171015171554_rename_revision_hold_item.pokeviewer.rb
@@ -1,8 +1,10 @@
 # This migration comes from pokeviewer (originally 20170930213633)
 class RenameRevisionHoldItem < ActiveRecord::Migration[5.1]
   def change
+    remove_column :pokeviewer_revisions, :hold_item, :integer
+
     change_table :pokeviewer_revisions do |t|
-      t.rename :hold_item, :item_id
+      t.integer :item_id
     end
 
     add_foreign_key :pokeviewer_revisions, :pokeviewer_items, column: :item_id
-- 
cgit 1.4.1