X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-upgrade;h=c988e130a6f918df412c87aa09d32817870add46;hb=078812ef1d27fc80e6bd4922bbe389e1e2048414;hp=01ca00c3ddbd2114c7004f0bd7d162c172599117;hpb=36f816929a95cfd8dafc66d7ecc6c6dba35dc0a1;p=freeside.git diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade index 01ca00c3d..c988e130a 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,13 @@ 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); + +my $start = time; die "Not running uid freeside!" unless checkeuid(); -getopts("dq"); +getopts("dqs"); $DEBUG = !$opt_q; #$DEBUG = $opt_v; @@ -36,13 +38,16 @@ dbdef_create($dbh, $dbdef_file); delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload reload_dbdef($dbdef_file); +warn "Upgrade startup completed in ". (time-$start). " seconds\n"; # if $DEBUG; +$start = time; + $DBIx::DBSchema::DEBUG = $DEBUG; $DBIx::DBSchema::Table::DEBUG = $DEBUG; $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 = ''"; @@ -65,41 +70,51 @@ if ( $DRY_RUN ) { or die "Error: ". $dbh->errstr. "\n executing: $statement"; } + warn "Pre-schema change upgrades completed in ". (time-$start). " seconds\n"; # if $DEBUG; + $start = time; + dbdef->update_schema( dbdef_dist(datasrc), $dbh ); } +warn "Schema upgrade completed in ". (time-$start). " seconds\n"; # if $DEBUG; +$start = time; + my $hashref = {}; $hashref->{dry_run} = 1 if $DRY_RUN; -$hashref->{debug} = 1 if $DEBUG; -print join "\n", prune_applications($hashref); -print "\n" if $DRY_RUN; +$hashref->{debug} = 1 if $DEBUG && $DRY_RUN; +prune_applications($hashref) unless $opt_s; -if ( $dbh->{Driver}->{Name} =~ /^mysql/i ) { +warn "Application pruning completed in ". (time-$start). " seconds\n"; # if $DEBUG; +$start = time; - my $sth = $dbh->prepare( - "SELECT COUNT(*) FROM duplicate_lock WHERE lockname = 'svc_acct'" - ) or die $dbh->errstr; +print "\n" if $DRY_RUN; - $sth->execute or die $sth->errstr; +if ( $dbh->{Driver}->{Name} =~ /^mysql/i && ! $opt_s ) { - unless ( $sth->fetchrow_arrayref->[0] ) { + foreach my $table (qw( svc_acct svc_phone )) { - $sth = $dbh->prepare( - "INSERT INTO duplicate_lock ( lockname ) VALUES ( 'svc_acct' )" + my $sth = $dbh->prepare( + "SELECT COUNT(*) FROM duplicate_lock WHERE lockname = '$table'" ) or die $dbh->errstr; $sth->execute or die $sth->errstr; + unless ( $sth->fetchrow_arrayref->[0] ) { + + $sth = $dbh->prepare( + "INSERT INTO duplicate_lock ( lockname ) VALUES ( '$table' )" + ) or die $dbh->errstr; + + $sth->execute or die $sth->errstr; + + } + } -} -$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); + warn "Duplication lock creation completed in ". (time-$start). " seconds\n"; # if $DEBUG; + $start = time; -upgrade() - unless $DRY_RUN; +} $dbh->commit or die $dbh->errstr; @@ -108,7 +123,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 +141,28 @@ unless ( $DRY_RUN ) { $dbh->commit or die $dbh->errstr; $dbh->disconnect or die $dbh->errstr; +$dbh = adminsuidsetup($user); + +warn "Re-initialization with updated schema completed in ". (time-$start). " seconds\n"; # if $DEBUG; +$start = time; + +upgrade() + unless $DRY_RUN || $opt_s; + +warn "Table updates completed in ". (time-$start). " seconds\n"; # if $DEBUG; +$start = time; + +upgrade_sqlradius() + unless $DRY_RUN || $opt_s; + +warn "SQL RADIUS updates completed in ". (time-$start). " seconds\n"; # if $DEBUG; +$start = time; + +$dbh->commit or die $dbh->errstr; +$dbh->disconnect or die $dbh->errstr; + +warn "Commit and disconnection completed in ". (time-$start). " seconds; upgrade done!\n"; # if $DEBUG; + ### sub dbdef_create { # reverse engineer the schema from the DB and save to file @@ -135,7 +172,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 +181,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 +206,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