[freeside-commits] freeside/FS/bin freeside-upgrade,1.17,1.18

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail:/tmp/cvs-serv27176

Modified Files:
	freeside-upgrade 
Log Message:
correct order of operations

Index: freeside-upgrade
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-upgrade,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- freeside-upgrade	14 Dec 2007 03:56:39 -0000	1.17
+++ freeside-upgrade	14 Dec 2007 21:32:32 -0000	1.18
@@ -93,14 +93,6 @@
   }
 }
 
-$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 @@
 $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