From f13d62bdf7cdc2a30883018904e6d2bc858105e0 Mon Sep 17 00:00:00 2001
From: Jared Hancock <gravydish@gmail.com>
Date: Mon, 23 Apr 2012 17:13:11 -0500
Subject: [PATCH] Timestamp column should be last in the table

---
 main.inc.php                                                  | 2 +-
 ...be9c0cb-3c2e0f54.patch.sql => abe9c0cb-bbb021fb.patch.sql} | 4 ++--
 setup/inc/sql/osticket-v1.7-mysql.sql                         | 2 +-
 setup/inc/sql/osticket-v1.7-mysql.sql.md5                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename setup/inc/sql/{abe9c0cb-3c2e0f54.patch.sql => abe9c0cb-bbb021fb.patch.sql} (71%)

diff --git a/main.inc.php b/main.inc.php
index c7472a288..1850eb31b 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -55,7 +55,7 @@
 
     #Current version && schema signature (Changes from version to version)
     define('THIS_VERSION','1.7-DPR2'); //Shown on admin panel
-    define('SCHEMA_SIGNATURE','3c2e0f54d9e08bad38028cd42767c7c9'); //MD5 signature of the db schema. (used to trigger upgrades)
+    define('SCHEMA_SIGNATURE','bbb021fbeb377ca66b6997b77e0167cc'); //MD5 signature of the db schema. (used to trigger upgrades)
 
     #load config info
     $configfile='';
diff --git a/setup/inc/sql/abe9c0cb-3c2e0f54.patch.sql b/setup/inc/sql/abe9c0cb-bbb021fb.patch.sql
similarity index 71%
rename from setup/inc/sql/abe9c0cb-3c2e0f54.patch.sql
rename to setup/inc/sql/abe9c0cb-bbb021fb.patch.sql
index 8594a47ac..0a3248db4 100644
--- a/setup/inc/sql/abe9c0cb-3c2e0f54.patch.sql
+++ b/setup/inc/sql/abe9c0cb-bbb021fb.patch.sql
@@ -7,8 +7,8 @@
  */
 
 ALTER TABLE `%TABLE_PREFIX%ticket_event`
-    ADD `annulled` tinyint(1) NOT NULL DEFAULT '0' AFTER `timestamp`;
+    ADD `annulled` tinyint(1) NOT NULL DEFAULT '0' AFTER `staff`;
 
 -- Finished with patch
 UPDATE `%TABLE_PREFIX%config`
-    SET `schema_signature`='3c2e0f54d9e08bad38028cd42767c7c9';
+    SET `schema_signature`='bbb021fbeb377ca66b6997b77e0167cc';
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql b/setup/inc/sql/osticket-v1.7-mysql.sql
index 625342f65..6c22f9919 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql
@@ -615,8 +615,8 @@ CREATE TABLE `%TABLE_PREFIX%ticket_event` (
   `topic_id` int(11) unsigned NOT NULL,
   `state` enum('created','closed','reopened','assigned','transferred','overdue') NOT NULL,
   `staff` varchar(255) NOT NULL default 'SYSTEM',
-  `timestamp` datetime NOT NULL,
   `annulled` tinyint(1) unsigned NOT NULL defalt '0',
+  `timestamp` datetime NOT NULL,
   KEY `ticket_state` (`ticket_id`, `state`, `timestamp`),
   KEY `ticket_stats` (`timestamp`, `state`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql.md5 b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
index fb57be3ed..e9497d0eb 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql.md5
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
@@ -1 +1 @@
-3c2e0f54d9e08bad38028cd42767c7c9
+bbb021fbeb377ca66b6997b77e0167cc
-- 
GitLab