X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-upgrade;h=c539c274869aacaec9ef0973d47846881ad5311f;hb=12587c5314c2a2ee40ab046af1552a40db5e0eaf;hp=d143d9206acacaa7fbbc979c84e55f7c6a1c920f;hpb=dcf75587288f55b34d7cbfcec433787a14381d6c;p=freeside.git

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index d143d9206..c539c2748 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;
@@ -15,7 +15,7 @@ use FS::Upgrade qw(upgrade);
 
 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 = ''";
 
@@ -71,10 +71,10 @@ if ( $DRY_RUN ) {
 my $hashref = {};
 $hashref->{dry_run} = 1 if $DRY_RUN;
 $hashref->{debug} = 1 if $DEBUG;
-print join "\n", prune_applications($hashref);
+print join "\n", 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'"
@@ -121,7 +121,10 @@ $dbh->disconnect or die $dbh->errstr;
 $dbh = adminsuidsetup($user);
 
 upgrade()
-  unless $DRY_RUN;
+  unless $DRY_RUN || $opt_s;
+
+upgrade_sqlradius()
+  unless $DRY_RUN || $opt_s;
 
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
@@ -135,7 +138,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 +147,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 +172,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