From 62cc660119e445d90f5dccf2bdfd661dbbe70ac9 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 11 Apr 2009 20:51:32 +0000 Subject: don't run configuration update when -s is used for schema-only slony slave update --- FS/bin/freeside-upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'FS/bin/freeside-upgrade') diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade index c988e130a..24f577f11 100755 --- a/FS/bin/freeside-upgrade +++ b/FS/bin/freeside-upgrade @@ -127,7 +127,7 @@ $FS::UID::AutoCommit = 0; $FS::UID::callback_hack = 1; $dbh = adminsuidsetup($user); $FS::UID::callback_hack = 0; -unless ( $DRY_RUN ) { +unless ( $DRY_RUN || $opt_s ) { my $dir = "%%%FREESIDE_CONF%%%/conf.". datasrc; if (!scalar(qsearch('conf', {}))) { my $error = FS::Conf::init_config($dir); -- cgit v1.2.1 From c6ba0fa6271880599ce3d60dcd23de248526f0b8 Mon Sep 17 00:00:00 2001 From: jeff Date: Mon, 18 May 2009 18:21:38 +0000 Subject: prevent death on meritless sqlradius upgrade attempts --- FS/bin/freeside-upgrade | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'FS/bin/freeside-upgrade') diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade index 24f577f11..7ee35c68d 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_s $opt_q $opt_v); +use vars qw($opt_d $opt_s $opt_q $opt_v $opt_r); use vars qw($DEBUG $DRY_RUN); use Getopt::Std; use DBIx::DBSchema 0.31; @@ -17,7 +17,7 @@ my $start = time; die "Not running uid freeside!" unless checkeuid(); -getopts("dqs"); +getopts("dqrs"); $DEBUG = !$opt_q; #$DEBUG = $opt_v; @@ -153,7 +153,7 @@ warn "Table updates completed in ". (time-$start). " seconds\n"; # if $DEBUG; $start = time; upgrade_sqlradius() - unless $DRY_RUN || $opt_s; + unless $DRY_RUN || $opt_s || $opt_r; warn "SQL RADIUS updates completed in ". (time-$start). " seconds\n"; # if $DEBUG; $start = time; @@ -172,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 ] [ -s ] [ -q | -v ] user\n"; + die "Usage:\n freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ] user\n"; } =head1 NAME @@ -181,7 +181,7 @@ freeside-upgrade - Upgrades database schema for new freeside verisons. =head1 SYNOPSIS - freeside-upgrade [ -d ] [ -s ] [ -q | -v ] + freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ] =head1 DESCRIPTION @@ -203,6 +203,9 @@ Also performs other upgrade functions: [ -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. -- cgit v1.2.1 From aa6c509c76c647d05d7bc94ca58effa845cac245 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 22 May 2009 03:22:38 +0000 Subject: commit before sqlradius upgrade so sqlradius upgrade errors from permissions can be ignored for now --- FS/bin/freeside-upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'FS/bin/freeside-upgrade') diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade index 7ee35c68d..97babbd68 100755 --- a/FS/bin/freeside-upgrade +++ b/FS/bin/freeside-upgrade @@ -149,6 +149,8 @@ $start = time; upgrade() unless $DRY_RUN || $opt_s; +$dbh->commit or die $dbh->errstr; + warn "Table updates completed in ". (time-$start). " seconds\n"; # if $DEBUG; $start = time; @@ -161,7 +163,7 @@ $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; +warn "Final commit and disconnection completed in ". (time-$start). " seconds; upgrade done!\n"; # if $DEBUG; ### -- cgit v1.2.1 From 121b02fd16385ae08338a7be911eef18598280a5 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 10 Jun 2009 03:00:08 +0000 Subject: don't attempt to create h_queue indices, for SG upgradability --- FS/bin/freeside-upgrade | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'FS/bin/freeside-upgrade') diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade index 97babbd68..43cebd940 100755 --- a/FS/bin/freeside-upgrade +++ b/FS/bin/freeside-upgrade @@ -60,20 +60,24 @@ if (dbdef->table('cust_main')->column('agent_custid') && ! $opt_s) { #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 +my @statements = + grep { $_ !~ /^CREATE +INDEX +h_queue/ } #useless, holds up queue insertion + dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh ) + if ( $DRY_RUN ) { print - join(";\n", @bugfix, dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh ) ). ";\n"; + join(";\n", @bugfix, @statements ). ";\n"; exit; } else { - foreach my $statement ( @bugfix ) { + foreach my $statement ( @bugfix, @statements ) { $dbh->do( $statement ) or die "Error: ". $dbh->errstr. "\n executing: $statement"; } - warn "Pre-schema change upgrades completed in ". (time-$start). " seconds\n"; # if $DEBUG; - $start = time; +# warn "Pre-schema change upgrades completed in ". (time-$start). " seconds\n"; # if $DEBUG; +# $start = time; - dbdef->update_schema( dbdef_dist(datasrc), $dbh ); +# dbdef->update_schema( dbdef_dist(datasrc), $dbh ); } warn "Schema upgrade completed in ". (time-$start). " seconds\n"; # if $DEBUG; -- cgit v1.2.1 From fa71778349c136623f0755bf30ce9f65fbaabf14 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 10 Jun 2009 03:06:21 +0000 Subject: doh, semicolon --- FS/bin/freeside-upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'FS/bin/freeside-upgrade') diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade index 43cebd940..6ced37297 100755 --- a/FS/bin/freeside-upgrade +++ b/FS/bin/freeside-upgrade @@ -62,7 +62,7 @@ if (dbdef->table('cust_main')->column('agent_custid') && ! $opt_s) { my @statements = grep { $_ !~ /^CREATE +INDEX +h_queue/ } #useless, holds up queue insertion - dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh ) + dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh ); if ( $DRY_RUN ) { print -- cgit v1.2.1