From 443e62eee7192aee45087561077cca263d530790 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Mon, 14 Sep 2020 17:23:40 -0400
Subject: [PATCH] always disable migration when creating database for the first
 time

---
 .../wizard/server/listener/SystemInitializerListener.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java
index 03db525..b87e517 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java
@@ -66,8 +66,9 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase {
             if (checkTable) {
                 ok = checkTable(config);
                 if (!ok) {
-                    // create the schema when the test table does not exist
+                    // create the schema when the test table does not exist. Disable migration
                     config.getDatabase().getHibernate().setHbm2ddlAuto("create");
+                    config.getDatabase().setMigrationEnabled(false);
                 }
             } else {
                 config.execSql("select 1");
@@ -124,7 +125,7 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase {
             try {
                 return runTableCheck(config, tableName);
             } catch (Exception e) {
-                log.warn("table '"+tableName+"' not found, will create schema: " + shortError(e));
+                log.warn("table '"+tableName+"' not found, will create schema (disabling migration): " + shortError(e));
                 config.getDatabase().getHibernate().setHbm2ddlAuto("create");
                 config.getDatabase().setMigrationEnabled(false);
             }
@@ -145,7 +146,7 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase {
             try {
                 runTableCheck(config, tableName);
             } catch (Exception e) {
-                die(PREFIX + "table '"+tableName+"' not found: " + shortError(e));
+                die(PREFIX + "runTableCheck failed for table '"+tableName+"': " + shortError(e));
             }
         }
         if (isCheckRedis()) {