Peter M. Groen / knowledgetree

Commit 674cc36ca3fdf8145687791b25a6cfefb45fc389

Authored by kevin_fourie
1 parent 45928d94

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.

Committed By: Kevin Fourie
Reviewed By: Donald Jackson
(cherry picked from commit 9e47511fca37b1da824a1dfba265638497d78d88)

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/branches/RB_3.5.4a@9677 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
.gitignore
  View file @674cc36
@@ -9,3 +9,4 @@ plugins/professional-reporting/ @@ -9,3 +9,4 @@ plugins/professional-reporting/
9 plugins/shortcuts/ 9 plugins/shortcuts/
10 plugins/wintools/ 10 plugins/wintools/
11 plugins/updatesandmessages/ 11 plugins/updatesandmessages/
  12 +var/cache/configcache
lib/upgrades/UpgradeFunctions.inc.php
  View file @674cc36
@@ -121,7 +121,8 @@ class UpgradeFunctions { @@ -121,7 +121,8 @@ class UpgradeFunctions {
121 121
122 var $priority = array( 122 var $priority = array(
123 'addAutoIncrementToTables'=>1, 123 'addAutoIncrementToTables'=>1,
124 - 'addAutoIncrementToTables2'=>-1 124 + 'addAutoIncrementToTables2'=>-1,
  125 + 'removeOldFilesAndFolders354'=>1
125 ); 126 );
126 127
127 function addAutoIncrementToTables2() 128 function addAutoIncrementToTables2()