oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed 729643

Browse source
This commit is contained in:
JT Smith 2003-05-10 22:52:58 +00:00
parent 64c7a9da73
commit 2d0515d532
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sbin/upgrade.pl
View file

@ -172,9 +172,10 @@ foreach $file (@files) {
'FILE' => $config{$file}{configFile}, 'FILE' => $config{$file}{configFile},
'PURGE' => 1); 'PURGE' => 1);
$config{$file}{dsn} = $config->get('dsn'); $config{$file}{dsn} = $config->get('dsn');
$config{$file}{dsn} =~ /DBI\:(\w+)\:(\w+).*/; $config{$file}{dsn} =~ /^DBI\:(\w+)\:(\w+)(\:(.*)|)$/;
if ($1 eq "mysql") { if ($1 eq "mysql") {
$config{$file}{db} = $2; $config{$file}{db} = $2;
$config{$file}{host} = $4;
$config{$file}{dbuser} = $config->get('dbuser'); $config{$file}{dbuser} = $config->get('dbuser');
$config{$file}{dbpass} = $config->get('dbpass'); $config{$file}{dbpass} = $config->get('dbpass');
$config{$file}{mysqlCLI} = $config->get('mysqlCLI'); $config{$file}{mysqlCLI} = $config->get('mysqlCLI');
@ -207,8 +208,9 @@ foreach $config (keys %config) {
unless ($skipBackup) { unless ($skipBackup) {
print "\n".$config{$config}{db}." ".$upgrade{$upgrade}{from}."-".$upgrade{$upgrade}{to}."\n" unless ($quiet); print "\n".$config{$config}{db}." ".$upgrade{$upgrade}{from}."-".$upgrade{$upgrade}{to}."\n" unless ($quiet);
print "\tBacking up $config{$config}{db} ($upgrade{$upgrade}{from})..." unless ($quiet); print "\tBacking up $config{$config}{db} ($upgrade{$upgrade}{from})..." unless ($quiet);
my $cmd = $dumpcmd." -u".$config{$config}{dbuser}." -p".$config{$config}{dbpass} my $cmd = $dumpcmd." -u".$config{$config}{dbuser}." -p".$config{$config}{dbpass};
." --add-drop-table --databases ".$config{$config}{db}." > " $cmd .= " --host=".$config{$config}{host} if ($config{$config}{host});
$cmd .= " --add-drop-table --databases ".$config{$config}{db}." > "
.$backupTo."/".$config{$config}{db}."_".$upgrade{$upgrade}{from}.".sql"; .$backupTo."/".$config{$config}{db}."_".$upgrade{$upgrade}{from}.".sql";
unless (system($cmd)) { unless (system($cmd)) {
print "OK\n" unless ($quiet); print "OK\n" unless ($quiet);
@ -217,8 +219,9 @@ foreach $config (keys %config) {
} }
} }
print "\tUpgrading to ".$upgrade{$upgrade}{to}."..." unless ($quiet); print "\tUpgrading to ".$upgrade{$upgrade}{to}."..." unless ($quiet);
my $cmd = $clicmd." -u".$config{$config}{dbuser}." -p".$config{$config}{dbpass} my $cmd = $clicmd." -u".$config{$config}{dbuser}." -p".$config{$config}{dbpass};
." --database=".$config{$config}{db}." < ".$upgrade{$upgrade}{sql}; $cmd .= " --host=".$config{$config}{host} if ($config{$config}{host});
$cmd .= " --database=".$config{$config}{db}." < ".$upgrade{$upgrade}{sql};
unless (system($cmd)) { unless (system($cmd)) {
print "OK\n" unless ($quiet); print "OK\n" unless ($quiet);
} else { } else {