From a10e235bebe8e9d0132d6430039d73e378694783 Mon Sep 17 00:00:00 2001
From: Jakob Schrettenbrunner <dev@schrej.net>
Date: Sun, 12 Feb 2017 17:38:15 +0100
Subject: [PATCH] revert accidental changes to migrations

---
 .../migrations/2016_08_30_213301_modify_ip_storage_method.php | 4 ++--
 .../migrations/2016_09_17_194246_add_docker_image_column.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/database/migrations/2016_08_30_213301_modify_ip_storage_method.php b/database/migrations/2016_08_30_213301_modify_ip_storage_method.php
index 768ef0b55..b77ccbea6 100644
--- a/database/migrations/2016_08_30_213301_modify_ip_storage_method.php
+++ b/database/migrations/2016_08_30_213301_modify_ip_storage_method.php
@@ -24,7 +24,7 @@ class ModifyIpStorageMethod extends Migration
                 [
                     'ip' => $server->ip,
                     'port' => $server->port,
-                    'node' => $server->node_id,
+                    'node' => $server->node,
                 ]
             );
 
@@ -61,7 +61,7 @@ class ModifyIpStorageMethod extends Migration
         // Find the allocations and reset the servers...
         $servers = DB::select('SELECT id, allocation FROM servers');
         foreach ($servers as $server) {
-            $allocation = DB::select('SELECT * FROM allocations WHERE id = :alocid', ['alocid' => $server->allocation_id]);
+            $allocation = DB::select('SELECT * FROM allocations WHERE id = :alocid', ['alocid' => $server->allocation]);
 
             if (isset($allocation[0])) {
                 DB::update(
diff --git a/database/migrations/2016_09_17_194246_add_docker_image_column.php b/database/migrations/2016_09_17_194246_add_docker_image_column.php
index ce7d91203..58e4b87a3 100644
--- a/database/migrations/2016_09_17_194246_add_docker_image_column.php
+++ b/database/migrations/2016_09_17_194246_add_docker_image_column.php
@@ -22,7 +22,7 @@ class AddDockerImageColumn extends Migration
             $servers = DB::table('servers')->select(
                 'servers.id',
                 'service_options.docker_image as s_optionImage'
-            )->join('service_options', 'service_options.id', '=', 'servers.option_id')->get();
+            )->join('service_options', 'service_options.id', '=', 'servers.option')->get();
 
             foreach ($servers as $server) {
                 $server->image = $server->s_optionImage;