projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't print out the cust_credit_refund pruning every time
[freeside.git]
/
FS
/
bin
/
freeside-upgrade
diff --git
a/FS/bin/freeside-upgrade
b/FS/bin/freeside-upgrade
index
04bcb23
..
f3c4461
100755
(executable)
--- a/
FS/bin/freeside-upgrade
+++ b/
FS/bin/freeside-upgrade
@@
-1,7
+1,7
@@
#!/usr/bin/perl -w
use strict;
#!/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;
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::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();
die "Not running uid freeside!" unless checkeuid();
-getopts("dq");
+getopts("dq
s
");
$DEBUG = !$opt_q;
#$DEBUG = $opt_v;
$DEBUG = !$opt_q;
#$DEBUG = $opt_v;
@@
-42,7
+42,7
@@
$DBIx::DBSchema::Index::DEBUG = $DEBUG;
my @bugfix = ();
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 = ''";
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;
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;
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'"
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);
$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
$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;
$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->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
###
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 {
}
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
}
=head1 NAME
@@
-144,7
+148,7
@@
freeside-upgrade - Upgrades database schema for new freeside verisons.
=head1 SYNOPSIS
=head1 SYNOPSIS
- freeside-upgrade [ -d ] [ -q | -v ]
+ freeside-upgrade [ -d ] [ -
s ] [ -
q | -v ]
=head1 DESCRIPTION
=head1 DESCRIPTION
@@
-169,6
+173,9
@@
Also performs other upgrade functions:
[ -v ]: Run verbosely, sending debugging information to STDERR. This is the
current default.
[ -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
=head1 SEE ALSO
=cut