Merge pull request #1318 from protich/issue/1316

bug: Add ticket status properties field exist before loading initial data

Reviewed-By: Jared Hancock <jared@osticket.com>

include/upgrader/streams/core/03ff59bf-b26f29a6.cleanup.sql

@@ -4,4 +4,7 @@ DELETE FROM  `%TABLE_PREFIX%config`
 DELETE FROM `%TABLE_PREFIX%ticket_status`
     WHERE `state` = 'resolved';
 
+ALTER TABLE  `%TABLE_PREFIX%ticket_status`
+    DROP  `notes`;
+
 OPTIMIZE TABLE `%TABLE_PREFIX%ticket_status`;

include/upgrader/streams/core/03ff59bf-b26f29a6.patch.sql

@@ -18,10 +18,19 @@ UPDATE  `%TABLE_PREFIX%ticket` t1
     SET t1.status_id = @statusId
     WHERE t2.state='resolved';
 
--- add properties field
-ALTER TABLE  `%TABLE_PREFIX%ticket_status`
-    ADD  `properties` TEXT NOT NULL AFTER  `sort`,
+-- add properties field IF it doesn't exist
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+        FROM INFORMATION_SCHEMA.COLUMNS
+        WHERE table_name = '%TABLE_PREFIX%ticket_status'
+        AND table_schema = DATABASE()
+        AND column_name = 'properties'
+    ) > 0,
+    "SELECT 1",
+    "ALTER TABLE `%TABLE_PREFIX%ticket_status` ADD `properties` text NOT NULL AFTER `sort`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
 
 UPDATE `%TABLE_PREFIX%ticket_status` s
     INNER JOIN `ost_config` c

include/upgrader/streams/core/8f99b8bf-03ff59bf.patch.sql

@@ -51,6 +51,7 @@ CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%ticket_status` (
   `mode` int(11) unsigned NOT NULL DEFAULT '0',
   `flags` int(11) unsigned NOT NULL DEFAULT '0',
   `sort` int(11) unsigned NOT NULL DEFAULT '0',
+  `properties` text NOT NULL,
   `notes` text NOT NULL,
   `created` datetime NOT NULL,
   `updated` datetime NOT NULL,