X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-upgrade;h=f3c446169f73f4796ee1b2c04a73e6b1db17d56e;hb=f3c456bae0314d53900bce1e2c512e8c55667dc4;hp=04bcb234046b64f79e4e5799185068f9a29090c7;hpb=158a88620fa861dc473bf5501526fb1e9a9517dd;p=freeside.git

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 04bcb2340..f3c446169 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw($opt_d $opt_q $opt_v);
+use vars qw($opt_d $opt_s $opt_q $opt_v);
 use vars qw($DEBUG $DRY_RUN);
 use Getopt::Std;
 use DBIx::DBSchema 0.31;
@@ -11,11 +11,11 @@ use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
 use FS::Misc::prune qw(prune_applications);
 use FS::Conf;
 use FS::Record qw(qsearch);
-use FS::Upgrade qw(upgrade);
+use FS::Upgrade qw(upgrade upgrade_sqlradius);
 
 die "Not running uid freeside!" unless checkeuid();
 
-getopts("dq");
+getopts("dqs");
 
 $DEBUG = !$opt_q;
 #$DEBUG = $opt_v;
@@ -42,7 +42,7 @@ $DBIx::DBSchema::Index::DEBUG = $DEBUG;
 
 my @bugfix = ();
 
-if (dbdef->table('cust_main')->column('agent_custid')) { 
+if (dbdef->table('cust_main')->column('agent_custid') && ! $opt_s) { 
   push @bugfix,
     "UPDATE cust_main SET agent_custid = NULL where agent_custid = ''";
 
@@ -70,11 +70,12 @@ if ( $DRY_RUN ) {
 
 my $hashref = {};
 $hashref->{dry_run} = 1 if $DRY_RUN;
-$hashref->{debug} = 1 if $DEBUG;
-print join "\n", prune_applications($hashref);
+$hashref->{debug} = 1 if $DEBUG && $DRY_RUN;
+prune_applications($hashref) unless $opt_s;
+
 print "\n" if $DRY_RUN;
 
-if ( $dbh->{Driver}->{Name} =~ /^mysql/i ) {
+if ( $dbh->{Driver}->{Name} =~ /^mysql/i && ! $opt_s ) {
 
   my $sth = $dbh->prepare(
     "SELECT COUNT(*) FROM duplicate_lock WHERE lockname = 'svc_acct'"
@@ -93,14 +94,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
-reload_dbdef($dbdef_file);
-
-upgrade()
-  unless $DRY_RUN;
-
 $dbh->commit or die $dbh->errstr;
 
 dbdef_create($dbh, $dbdef_file);
@@ -108,7 +101,7 @@ dbdef_create($dbh, $dbdef_file);
 $dbh->disconnect or die $dbh->errstr;
 
 delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
-$FS::UID::AutoCommit = 1;
+$FS::UID::AutoCommit = 0;
 $FS::UID::callback_hack = 1;
 $dbh = adminsuidsetup($user);
 $FS::UID::callback_hack = 0;
@@ -126,6 +119,17 @@ unless ( $DRY_RUN ) {
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
+$dbh = adminsuidsetup($user);
+
+upgrade()
+  unless $DRY_RUN || $opt_s;
+
+upgrade_sqlradius()
+  unless $DRY_RUN || $opt_s;
+
+$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
@@ -135,7 +139,7 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file
 }
 
 sub usage {
-  die "Usage:\n  freeside-upgrade [ -d ] [ -q | -v ] user\n"; 
+  die "Usage:\n  freeside-upgrade [ -d ] [ -s ] [ -q | -v ] user\n"; 
 }
 
 =head1 NAME
@@ -144,7 +148,7 @@ freeside-upgrade - Upgrades database schema for new freeside verisons.
 
 =head1 SYNOPSIS
 
-  freeside-upgrade [ -d ] [ -q | -v ]
+  freeside-upgrade [ -d ] [ -s ] [ -q | -v ]
 
 =head1 DESCRIPTION
 
@@ -169,6 +173,9 @@ Also performs other upgrade functions:
   [ -v ]: Run verbosely, sending debugging information to STDERR.  This is the
           current default.
 
+  [ -s ]: Schema changes only.  Useful for Pg/slony slaves where the data
+          changes will be replicated from the Pg/slony master.
+
 =head1 SEE ALSO
 
 =cut