From 674cc36ca3fdf8145687791b25a6cfefb45fc389 Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Mon, 8 Dec 2008 13:08:46 +0000
Subject: [PATCH] KTC-656 - "DB upgrade fails: DB Error: Constraint violation" Fixed. The server_name.sql file is now removed first as it is no longer used.

---
 .gitignore                            | 1 +
 lib/upgrades/UpgradeFunctions.inc.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4eeed40..6adf8d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ plugins/professional-reporting/
 plugins/shortcuts/
 plugins/wintools/
 plugins/updatesandmessages/
+var/cache/configcache
diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php
index 16f6e81..3f9189d 100644
--- a/lib/upgrades/UpgradeFunctions.inc.php
+++ b/lib/upgrades/UpgradeFunctions.inc.php
@@ -121,7 +121,8 @@ class UpgradeFunctions {
 
     var $priority = array(
             'addAutoIncrementToTables'=>1,
-            'addAutoIncrementToTables2'=>-1
+            'addAutoIncrementToTables2'=>-1,
+            'removeOldFilesAndFolders354'=>1
             );
 
     function addAutoIncrementToTables2()
--
libgit2 0.21.4