From: jeff <jeff>
Date: Fri, 14 Dec 2007 21:32:32 +0000 (+0000)
Subject: correct order of operations
X-Git-Tag: TRIXBOX_2_6~178
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=ee873dffcea182e714385913e75e1134725d8321;p=freeside.git

correct order of operations
---

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 01ca00c3d..0e1d07660 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -93,14 +93,6 @@ if ( $dbh->{Driver}->{Name} =~ /^mysql/i ) {
   }
 }
 
-$dbh->commit or die $dbh->errstr;  # we *MUST* commit before upgrading data
-dbdef_create($dbh, $dbdef_file);
-delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
-$dbh = adminsuidsetup($user);
-
-upgrade()
-  unless $DRY_RUN;
-
 $dbh->commit or die $dbh->errstr;
 
 dbdef_create($dbh, $dbdef_file);
@@ -126,6 +118,14 @@ unless ( $DRY_RUN ) {
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
+$dbh = adminsuidsetup($user);
+
+upgrade()
+  unless $DRY_RUN;
+
+$dbh->commit or die $dbh->errstr;
+$dbh->disconnect or die $dbh->errstr;
+
 ###
 
 sub dbdef_create { # reverse engineer the schema from the DB and save to file