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

fixing upgrade bugs

Browse source
This commit is contained in:
JT Smith 2003-05-26 05:18:26 +00:00
parent 53f0b7c0f3
commit e63d5869f3
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
docs/upgrades/upgrade_5.2.6-5.3.0.pl
View file

@ -4,6 +4,7 @@ use lib "../../lib";
use Getopt::Long; use Getopt::Long;
use Parse::PlainConfig; use Parse::PlainConfig;
use strict; use strict;
use WebGUI::Session;
use WebGUI::International; use WebGUI::International;
use WebGUI::SQL; use WebGUI::SQL;
use WebGUI::URL; use WebGUI::URL;
@ -97,25 +98,25 @@ my $sth = WebGUI::SQL->read("select * from DataForm");
while (my %dataform = $sth->hash) { while (my %dataform = $sth->hash) {
my $startInsert = "insert into DataForm_field (wobjectId, DataForm_fieldId, sequenceNumber, name, status, type, my $startInsert = "insert into DataForm_field (wobjectId, DataForm_fieldId, sequenceNumber, name, status, type,
defaultValue, width, isMailField, label) values"; defaultValue, width, isMailField, label) values";
WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -5, 'from', WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNextId("DataForm_fieldId").", -5, 'from',
".quote($dataform{fromStatus}).", 'email', ".quote($dataform{fromField}).", $dataform{width}, 1, ".quote($dataform{fromStatus}).", 'email', ".quote($dataform{fromField}).", $dataform{width}, 1,
".quote(WebGUI::International::get(10,"DataForm")).")"); ".quote(WebGUI::International::get(10,"DataForm")).")");
WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -4, 'to', WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNextId("DataForm_fieldId").", -4, 'to',
".quote($dataform{toStatus}).", 'email', ".quote($dataform{toField}).", $dataform{width}, 1, ".quote($dataform{toStatus}).", 'email', ".quote($dataform{toField}).", $dataform{width}, 1,
".quote(WebGUI::International::get(11,"DataForm")).")"); ".quote(WebGUI::International::get(11,"DataForm")).")");
WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -3, 'cc', WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNextId("DataForm_fieldId").", -3, 'cc',
".quote($dataform{ccStatus}).", 'email', ".quote($dataform{ccField}).", $dataform{width}, 1, ".quote($dataform{ccStatus}).", 'email', ".quote($dataform{ccField}).", $dataform{width}, 1,
".quote(WebGUI::International::get(12,"DataForm")).")"); ".quote(WebGUI::International::get(12,"DataForm")).")");
WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -2, 'bcc', WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNextId("DataForm_fieldId").", -2, 'bcc',
".quote($dataform{bccStatus}).", 'email', ".quote($dataform{bccField}).", $dataform{width}, 1, ".quote($dataform{bccStatus}).", 'email', ".quote($dataform{bccField}).", $dataform{width}, 1,
".quote(WebGUI::International::get(13,"DataForm")).")"); ".quote(WebGUI::International::get(13,"DataForm")).")");
WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -1, 'subject', WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNextId("DataForm_fieldId").", -1, 'subject',
".quote($dataform{subjectStatus}).", 'text', ".quote($dataform{subjectField}).", $dataform{width}, 1, ".quote($dataform{subjectStatus}).", 'text', ".quote($dataform{subjectField}).", $dataform{width}, 1,
".quote(WebGUI::International::get(14,"DataForm")).")"); ".quote(WebGUI::International::get(14,"DataForm")).")");
my $i = 1; my $i = 1;
my $sth2 = WebGUI::SQL->read("select DataForm_fieldId from DataForm_field where wobjectId=$dataform{wobjectId} order by sequenceNumber"); my $sth2 = WebGUI::SQL->read("select DataForm_fieldId from DataForm_field where wobjectId=$dataform{wobjectId} order by sequenceNumber");
while (my ($id) = $sth2->array) { while (my ($id) = $sth2->array) {
WebGUI::SQL->write("update DataForm_fieldId set sequenceNumber=$i where MailForm_entryId=$id"); WebGUI::SQL->write("update DataForm_field set sequenceNumber=$i where DataForm_fieldId=$id");
$i++; $i++;
} }
$sth2->finish; $sth2->finish;

7
sbin/upgrade.pl
View file

@ -200,6 +200,7 @@ print "\nREADY TO BEGIN UPGRADES\n" unless ($quiet);
my $notRun = 1; my $notRun = 1;
chdir($upgradesPath);
foreach my $config (keys %config) { foreach my $config (keys %config) {
my $clicmd = $config{$config}{mysqlCLI} || $mysql; my $clicmd = $config{$config}{mysqlCLI} || $mysql;
my $dumpcmd = $config{$config}{mysqlDump} || $mysqldump; my $dumpcmd = $config{$config}{mysqlDump} || $mysqldump;
@ -223,20 +224,18 @@ foreach my $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};
$cmd .= " --host=".$config{$config}{host} if ($config{$config}{host}); $cmd .= " --host=".$config{$config}{host} if ($config{$config}{host});
$cmd .= " --database=".$config{$config}{db}." < ".$upgradesPath.$upgrade{$upgrade}{sql}; $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 {
print "Failed!\n" unless ($quiet); print "Failed!\n" unless ($quiet);
} }
if ($upgrade{$upgrade}{pl} ne "") { if ($upgrade{$upgrade}{pl} ne "") {
chdir($upgradesPath);
my $cmd = $perl." ".$upgrade{$upgrade}{pl}." --configFile=".$config; my $cmd = $perl." ".$upgrade{$upgrade}{pl}." --configFile=".$config;
$cmd .= " --quiet" if ($quiet); $cmd .= " --quiet" if ($quiet);
if (system($cmd)) { if (system($cmd)) {
print "\tProcessing upgrade executable failed! $!\n"; print "\tProcessing upgrade executable failed!\n";
} }
chdir("..".$slash."sbin");
} }
$config{$config}{version} = $upgrade{$upgrade}{to}; $config{$config}{version} = $upgrade{$upgrade}{to};
$notRun = 0; $notRun = 0;