From cfb886a394b6192d26b5fba8ffcf437dd97794c3 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Sun, 19 Feb 2012 17:14:57 +0000 Subject: [PATCH] fix initial install issues with new sql updater git-svn-id: http://www.observium.org/svn/observer/trunk@2878 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/sql-schema/update.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/includes/sql-schema/update.php b/includes/sql-schema/update.php index 2420045a7..b61941801 100644 --- a/includes/sql-schema/update.php +++ b/includes/sql-schema/update.php @@ -34,6 +34,8 @@ if ($db_rev = @dbFetchCell("SELECT version FROM `dbSchema`")) {} else $db_rev = 0; } +$insert = 0; + # For transition from old system if ($old_rev = @dbFetchCell("SELECT revision FROM `dbSchema`")) { @@ -46,8 +48,7 @@ if ($old_rev = @dbFetchCell("SELECT revision FROM `dbSchema`")) if ($old_rev < 2804) { $db_rev = 4; } if ($old_rev < 2827) { $db_rev = 5; } - dbQuery("ALTER TABLE `dbSchema` ADD `version` INT NOT NULL"); - dbInsert(array('version' => $db_rev), 'dbSchema'); + $insert = 1; } $updating = 0; @@ -118,7 +119,12 @@ foreach ($filelist as $file) if ($updating) { - dbUpdate(array('version' => $db_rev), 'dbSchema'); + if ($insert) + { + dbInsert(array('version' => $db_rev), 'dbSchema'); + } else { + dbUpdate(array('version' => $db_rev), 'dbSchema'); + } echo "-- Done\n"; }