From cf5b56642f7b1ca12343d8f519d055e80525d48a Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 11 Dec 2014 13:37:25 -0600
Subject: [PATCH] oops: Drop extra %role table definition

---
 include/upgrader/streams/core.sig                    |  2 +-
 ...8f9.cleanup.sql => 36f6b328-7337bc63.cleanup.sql} |  0
 ...7a338f9.patch.sql => 36f6b328-7337bc63.patch.sql} |  4 ++--
 ...-e7a338f9.task.php => 36f6b328-7337bc63.task.php} |  0
 setup/inc/streams/core/install-mysql.sql             | 12 ------------
 5 files changed, 3 insertions(+), 15 deletions(-)
 rename include/upgrader/streams/core/{36f6b328-e7a338f9.cleanup.sql => 36f6b328-7337bc63.cleanup.sql} (100%)
 rename include/upgrader/streams/core/{36f6b328-e7a338f9.patch.sql => 36f6b328-7337bc63.patch.sql} (97%)
 rename include/upgrader/streams/core/{36f6b328-e7a338f9.task.php => 36f6b328-7337bc63.task.php} (100%)

diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig
index 2888135a1..2babc79c7 100644
--- a/include/upgrader/streams/core.sig
+++ b/include/upgrader/streams/core.sig
@@ -1 +1 @@
-e7a338f95ed622678123386a8a59dfc0
+7337bc63d257cd49ddbebc1eecbd394e
diff --git a/include/upgrader/streams/core/36f6b328-e7a338f9.cleanup.sql b/include/upgrader/streams/core/36f6b328-7337bc63.cleanup.sql
similarity index 100%
rename from include/upgrader/streams/core/36f6b328-e7a338f9.cleanup.sql
rename to include/upgrader/streams/core/36f6b328-7337bc63.cleanup.sql
diff --git a/include/upgrader/streams/core/36f6b328-e7a338f9.patch.sql b/include/upgrader/streams/core/36f6b328-7337bc63.patch.sql
similarity index 97%
rename from include/upgrader/streams/core/36f6b328-e7a338f9.patch.sql
rename to include/upgrader/streams/core/36f6b328-7337bc63.patch.sql
index 0150b4fd1..f42351852 100644
--- a/include/upgrader/streams/core/36f6b328-e7a338f9.patch.sql
+++ b/include/upgrader/streams/core/36f6b328-7337bc63.patch.sql
@@ -1,6 +1,6 @@
 /**
  * @version v1.9.6
- * @signature e7a338f95ed622678123386a8a59dfc0
+ * @signature 7337bc63d257cd49ddbebc1eecbd394e
  * @title Add support for ticket tasks
  *
  * This patch adds ability to thread anything and introduces tasks
@@ -119,5 +119,5 @@ UPDATE `%TABLE_PREFIX%department`
 
 -- Set new schema signature
 UPDATE `%TABLE_PREFIX%config`
-    SET `value` = 'e7a338f95ed622678123386a8a59dfc0'
+    SET `value` = '7337bc63d257cd49ddbebc1eecbd394e'
     WHERE `key` = 'schema_signature' AND `namespace` = 'core';
diff --git a/include/upgrader/streams/core/36f6b328-e7a338f9.task.php b/include/upgrader/streams/core/36f6b328-7337bc63.task.php
similarity index 100%
rename from include/upgrader/streams/core/36f6b328-e7a338f9.task.php
rename to include/upgrader/streams/core/36f6b328-7337bc63.task.php
diff --git a/setup/inc/streams/core/install-mysql.sql b/setup/inc/streams/core/install-mysql.sql
index 9cc9a4003..9370d7bc1 100644
--- a/setup/inc/streams/core/install-mysql.sql
+++ b/setup/inc/streams/core/install-mysql.sql
@@ -418,18 +418,6 @@ CREATE TABLE `%TABLE_PREFIX%role` (
   UNIQUE KEY `name` (`name`)
 ) DEFAULT CHARSET=utf8;
 
-DROP TABLE IF EXISTS `%TABLE_PREFIX%role`;
-CREATE TABLE `%TABLE_PREFIX%role` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `flags` int(10) unsigned NOT NULL DEFAULT '1',
-  `name` varchar(64) DEFAULT NULL,
-  `notes` text,
-  `created` datetime NOT NULL,
-  `updated` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) DEFAULT CHARSET=utf8;
-
 DROP TABLE IF EXISTS `%TABLE_PREFIX%group_dept_access`;
 CREATE TABLE `%TABLE_PREFIX%group_dept_access` (
   `group_id` int(10) unsigned NOT NULL default '0',
-- 
GitLab