X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-upgrade;h=dd206883dc6ba73f31c7bb67c53fed1445fded25;hb=52e2e7880c1cb061cac6896613abf17eea5df13f;hp=5b94c477579381bb02f5226ab53e22bb5de8aa7c;hpb=ba46a6a90321490da78c764657ae19d5c6fd81f8;p=freeside.git

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 5b94c4775..dd206883d 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -5,7 +5,7 @@ use vars qw( $opt_d $opt_s $opt_q $opt_v $opt_r $opt_c $opt_j $opt_a );
 use vars qw( $DEBUG $DRY_RUN );
 use Getopt::Std;
 use DBD::Pg qw(:async); #for -a
-use DBIx::DBSchema 0.31; #0.39
+use DBIx::DBSchema 0.46;
 use FS::UID qw(adminsuidsetup checkeuid datasrc driver_name);
 use FS::CurrentUser;
 use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
@@ -100,11 +100,12 @@ if ( dbdef->table('upgrade_journal') ) {
                      ( SELECT MAX(upgradenum) FROM upgrade_journal )
                    )
     ";
-  } elsif ( driver_name =~ /^mysql/i ) {
-    push @bugfix, "
-       ALTER TABLE upgrade_journal AUTO_INCREMENT =
-                   ( ( SELECT MAX(upgradenum) FROM upgrade_journal ) + 1 )
-    ";
+  #MySQL can't do this in a statement so have to do it manually
+  #} elsif ( driver_name =~ /^mysql/i ) {
+  #  push @bugfix, "
+  #     ALTER TABLE upgrade_journal AUTO_INCREMENT =
+  #                 ( ( SELECT MAX(upgradenum) FROM upgrade_journal ) + 1 )
+  #  ";
   }
 }
 
@@ -464,14 +465,13 @@ Also performs other upgrade functions:
           current default.
 
   [ -s ]: Schema changes only.  Useful for Pg/slony slaves where the data
+          changes will be replicated from the Pg/slony master.
 
   [ -r ]: Skip sqlradius updates.  Useful for occassions where the sqlradius
           databases may be inaccessible.
 
   [ -c ]: Skip cdr and h_cdr updates.
 
-          changes will be replicated from the Pg/slony master.
-
   [ -j ]: Run certain upgrades asychronously from the job queue.  Currently 
           used only for the 2.x -> 3.x cust_location, cust_pay and part_pkg
           upgrades.  This may cause odd behavior before the upgrade is