X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-upgrade;h=7ee35c68d1a15dcb74f4fbdf4d8c395fee2c26b8;hb=c6ba0fa6271880599ce3d60dcd23de248526f0b8;hp=285ff7a0e16b3efc864db6958d7930210b7fd511;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade index 285ff7a0e..7ee35c68d 100755 --- a/FS/bin/freeside-upgrade +++ b/FS/bin/freeside-upgrade @@ -1,85 +1,120 @@ #!/usr/bin/perl -w use strict; +use vars qw($opt_d $opt_s $opt_q $opt_v $opt_r); use vars qw($DEBUG $DRY_RUN); -use Term::ReadKey; -use DBIx::DBSchema 0.27; +use Getopt::Std; +use DBIx::DBSchema 0.31; use FS::UID qw(adminsuidsetup checkeuid datasrc ); #getsecrets); +use FS::CurrentUser; 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 upgrade_sqlradius); +my $start = time; -$DEBUG = 1; -$DRY_RUN = 0; +die "Not running uid freeside!" unless checkeuid(); +getopts("dqrs"); -die "Not running uid freeside!" unless checkeuid(); +$DEBUG = !$opt_q; +#$DEBUG = $opt_v; + +$DRY_RUN = $opt_d; my $user = shift or die &usage; +$FS::CurrentUser::upgrade_hack = 1; +$FS::UID::callback_hack = 1; my $dbh = adminsuidsetup($user); +$FS::UID::callback_hack = 0; #needs to match FS::Schema... -my $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc; +my $dbdef_file = "%%%FREESIDE_CONF%%%/dbdef.". datasrc; 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; -foreach my $table ( dbdef_dist->tables ) { +$DBIx::DBSchema::DEBUG = $DEBUG; +$DBIx::DBSchema::Table::DEBUG = $DEBUG; +$DBIx::DBSchema::Index::DEBUG = $DEBUG; - if ( dbdef->table($table) ) { +my @bugfix = (); - warn "$table exists\n" if $DEBUG > 1; +if (dbdef->table('cust_main')->column('agent_custid') && ! $opt_s) { + push @bugfix, + "UPDATE cust_main SET agent_custid = NULL where agent_custid = ''"; - foreach my $column ( dbdef_dist->table($table)->columns ) { - if ( dbdef->table($table)->column($column) ) { - warn " $table.$column exists\n" if $DEBUG > 2; - } else { + push @bugfix, + "UPDATE h_cust_main SET agent_custid = NULL where agent_custid = ''" + if (dbdef->table('h_cust_main')); +} - if ( $DEBUG ) { - print STDERR "column $table.$column does not exist. create?"; - next unless yesno(); - } +#you should have run fs-migrate-part_svc ages ago, when you upgraded +#from 1.3 to 1.4... if not, it needs to be hooked into -upgrade here or +#you'll lose all the part_svc settings it migrates to part_svc_column + +if ( $DRY_RUN ) { + print + join(";\n", @bugfix, dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh ) ). ";\n"; + exit; +} else { + foreach my $statement ( @bugfix ) { + $dbh->do( $statement ) + or die "Error: ". $dbh->errstr. "\n executing: $statement"; + } - foreach my $statement ( - dbdef_dist->table($table)->column($column)->sql_add_column( $dbh ) - ) { - warn "$statement\n" if $DEBUG || $DRY_RUN; - unless ( $DRY_RUN ) { - $dbh->do( $statement) - or die "CREATE error: ". $dbh->errstr. "\nexecuting: $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; - #should eventually check & create missing indices +my $hashref = {}; +$hashref->{dry_run} = 1 if $DRY_RUN; +$hashref->{debug} = 1 if $DEBUG && $DRY_RUN; +prune_applications($hashref) unless $opt_s; - #should eventually drop columns not in dbdef_dist... +warn "Application pruning completed in ". (time-$start). " seconds\n"; # if $DEBUG; +$start = time; - } else { +print "\n" if $DRY_RUN; - if ( $DEBUG ) { - print STDERR "table $table does not exist. create?"; - next unless yesno(); - } +if ( $dbh->{Driver}->{Name} =~ /^mysql/i && ! $opt_s ) { + + foreach my $table (qw( svc_acct svc_phone )) { + + 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; - foreach my $statement ( - dbdef_dist->table($table)->sql_create_table( $dbh ) - ) { - warn "$statement\n" if $DEBUG || $DRY_RUN; - unless ( $DRY_RUN ) { - $dbh->do( $statement) - or die "CREATE error: ". $dbh->errstr. "\nexecuting: $statement"; - } } } -} + warn "Duplication lock creation completed in ". (time-$start). " seconds\n"; # if $DEBUG; + $start = time; -# should eventually drop tables not in dbdef_dist too i guess... +} $dbh->commit or die $dbh->errstr; @@ -87,33 +122,48 @@ dbdef_create($dbh, $dbdef_file); $dbh->disconnect or die $dbh->errstr; -### - -my $all = 0; -sub yesno { - print STDERR ' [yes/no/all] '; - if ( $all ) { - warn "yes\n"; - return 1; - } else { - while ( 1 ) { - ReadMode 4; - my $x = lc(ReadKey); - ReadMode 0; - if ( $x eq 'n' ) { - warn "no\n"; - return 0; - } elsif ( $x eq 'y' ) { - warn "yes\n"; - return 1; - } elsif ( $x eq 'a' ) { - warn "yes\n"; - $all = 1; - return 1; - } +delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload +$FS::UID::AutoCommit = 0; +$FS::UID::callback_hack = 1; +$dbh = adminsuidsetup($user); +$FS::UID::callback_hack = 0; +unless ( $DRY_RUN || $opt_s ) { + my $dir = "%%%FREESIDE_CONF%%%/conf.". datasrc; + if (!scalar(qsearch('conf', {}))) { + my $error = FS::Conf::init_config($dir); + if ($error) { + warn "CONFIGURATION UPGRADE FAILED\n"; + $dbh->rollback or die $dbh->errstr; + die $error; } } } +$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 || $opt_r; + +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 my( $dbh, $file ) = @_; @@ -122,8 +172,47 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file } sub usage { - die "Usage:\n freeside-upgrade user\n"; + die "Usage:\n freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ] user\n"; } -1; +=head1 NAME + +freeside-upgrade - Upgrades database schema for new freeside verisons. + +=head1 SYNOPSIS + + freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ] + +=head1 DESCRIPTION + +Reads your existing database schema and updates it to match the current schema, +adding any columns or tables necessary. + +Also performs other upgrade functions: + +=over 4 + +=item Calls FS:: Misc::prune::prune_applications (probably unnecessary every upgrade, but simply won't find any records to change) + +=item If necessary, moves your configuration information from the filesystem in /usr/local/etc/freeside/conf. to the database. + +=back + + [ -d ]: Dry run; output SQL statements (to STDOUT) only, but do not execute + them. + + [ -q ]: Run quietly. This may become the default at some point. + + [ -r ]: Skip sqlradius updates. Useful for occassions where the sqlradius + databases may be inaccessible. + + [ -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