Bug 13795: Make database update idempotent

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/installer/data/mysql/atomicupdate/Bug13795_Remove_unused_columns.perl b/installer/data/mysql/atomicupdate/Bug13795_Remove_unused_columns.perl
index 51e223e..71c7604 100644 (file)
--- a/installer/data/mysql/atomicupdate/Bug13795_Remove_unused_columns.perl
+++ b/installer/data/mysql/atomicupdate/Bug13795_Remove_unused_columns.perl
@@ -1,12 +1,12 @@
 $DBversion = 'XXX'; # will be replaced by the RM
 if( CheckVersion( $DBversion ) ) {
-    $dbh->do(q{
-        ALTER TABLE statistics
-         DROP COLUMN associatedborrower
-         DROP COLUMN usercode
-    });
+    if( column_exists('statistics', 'associatedborrower') ) {
+        $dbh->do(q{ ALTER TABLE statistics DROP COLUMN associatedborrower });
+    }
+    if( column_exists('statistics', 'usercode') ) {
+        $dbh->do(q{ ALTER TABLE statistics DROP COLUMN usercode });
+    }
 
     SetVersion($DBversion);
-
     print "Upgrade to $DBversion done (Bug 13795 - Delete unused fields from statistics table)\n";
 }