From 6b02abdd3c3573c7291e5eaf1f9490d43b6fe4c7 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 21 Apr 2015 14:47:06 -0500
Subject: [PATCH] tz: Upgrade default_timezone_id to default_timezone
---
include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql | 3 ++-
include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql b/include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql
index 553c33b95..7877fbc61 100644
--- a/include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql
+++ b/include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql
@@ -19,4 +19,5 @@ ALTER TABLE `%TABLE_PREFIX%user_account`
DROP `dst`;
DELETE FROM `%TABLE_PREFIX%config`
- WHERE `key` = 'enable_daylight_saving' AND `namespace` = 'core';
+ WHERE `key` = IN ('enable_daylight_saving', 'default_timezone_id')
+ AND `namespace` = 'core';
diff --git a/include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql b/include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql
index f99d3a28c..ff057add8 100644
--- a/include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql
+++ b/include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql
@@ -167,6 +167,11 @@ UPDATE `%TABLE_PREFIX%config` A1
WHERE A1.`key` = 'default_timezone_id'
AND A1.`namespace` = 'core';
+UPDATE `%TABLE_PREFIX%config` A1
+ SET A1.`key` = 'default_timezone'
+ WHERE A1.`key` = 'default_timezone_id'
+ AND A1.`namespace` = 'core';
+
DROP TABLE %TABLE_PREFIX%_timezones;
ALTER TABLE `%TABLE_PREFIX%ticket`
--
GitLab