From 4027a5adf8528a48987b495e81f58e3f4d799a2a Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 13 May 2019 14:48:26 -0400
Subject: [PATCH] fix update script

---
 db/zm_update-1.33.9.sql | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/db/zm_update-1.33.9.sql b/db/zm_update-1.33.9.sql
index 2b298b8b9..e0d289ba4 100644
--- a/db/zm_update-1.33.9.sql
+++ b/db/zm_update-1.33.9.sql
@@ -1,3 +1,27 @@
-ALTER TABLE `Users`
-ADD  COLUMN `TokenMinExpiry`  BIGINT UNSIGNED NOT NULL DEFAULT 0 AFTER `MonitorIds`,
-ADD COLUMN `APIEnabled`  tinyint(3) UNSIGNED NOT NULL default 1 AFTER `TokenMinExpiry`;
+--
+-- Add per user API enable/disable and ability to set a minimum issued time for tokens
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Users'
+     AND column_name = 'TokenMinExpiry'
+    ) > 0,
+"SELECT 'Column TokenMinExpiry already exists in Users'",
+"ALTER TABLE Users ADD `TokenMinExpiry` BIGINT UNSIGNED NOT NULL DEFAULT 0 AFTER `MonitorIds`"  
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Users'
+     AND column_name = 'APIEnabled'
+    ) > 0,
+"SELECT 'Column APIEnabled already exists in Users'",
+"ALTER TABLE Users ADD `APIEnabled` tinyint(3) UNSIGNED NOT NULL default 1 AFTER `TokenMinExpiry`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;