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

Merge branch 'innodb' into 8

Browse source 
Conflicts:
	lib/WebGUI/Asset/Wobject/DataForm.pm
This commit is contained in:
Doug Bell 2010-02-17 15:09:04 -06:00
commit 8701842829
4 changed files with 3745 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3734
docs/upgrades/convert-db-to-innodb.sql Normal file
View file

File diff suppressed because it is too large Load diff

1
docs/upgrades/upgrade_7.8.1-8.0.0.pl
View file

@ -55,6 +55,7 @@ sub migrateToNewCache {
my $db = $session->db; my $db = $session->db;
$db->write("drop table cache"); $db->write("drop table cache");
$db->write("delete from WorkflowActivity where className in ('WebGUI::Workflow::Activity::CleanDatabaseCache','WebGUI::Workflow::Activity::CleanFileCache')"); $db->write("delete from WorkflowActivity where className in ('WebGUI::Workflow::Activity::CleanDatabaseCache','WebGUI::Workflow::Activity::CleanFileCache')");
$db->write("delete from WorkflowActivityData where activityId in ('pbwfactivity0000000002','pbwfactivity0000000022')");
print "DONE!\n" unless $quiet; print "DONE!\n" unless $quiet;
} }

2
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -264,7 +264,7 @@ sub _createForm {
elsif ( $class->isa('WebGUI::Form::List') ) { elsif ( $class->isa('WebGUI::Form::List') ) {
delete $param{size}; delete $param{size};
} }
elsif ( $type eq 'HTMLArea' && $data->{htmlAreaRichEditor} ne '**Use_Default_Editor**') { elsif ( $type eq 'HTMLArea' && $data->{htmlAreaRichEditor} ne '') {
$param{richEditId} = $data->{htmlAreaRichEditor} ; $param{richEditId} = $data->{htmlAreaRichEditor} ;
} }
return $class->new($session, \%param); return $class->new($session, \%param);

21
lib/WebGUI/SQL.pm
View file

@ -962,23 +962,20 @@ Use this ID to create a new row. Same as setting the key value to "new" except t
sub setRow { sub setRow {
my ($self, $table, $keyColumn, $data, $id) = @_; my ($self, $table, $keyColumn, $data, $id) = @_;
if ($data->{$keyColumn} eq "new" || $id) { $data->{$keyColumn} ||= $id;
$data->{$keyColumn} = $id || $self->session->id->generate(); if ($data->{$keyColumn} eq "new") {
$self->write("replace into $table (" . $self->dbh->quote_identifier($keyColumn) . ") values (?)",[$data->{$keyColumn}]); $data->{$keyColumn} = $self->session->id->generate();
} }
my $dbh = $self->dbh;
my @fields = (); my @fields = ();
my @data = (); my @data = ();
my @placeholders = ();
foreach my $key (keys %{$data}) { foreach my $key (keys %{$data}) {
unless ($key eq $keyColumn) { push(@fields, $dbh->quote_identifier($key));
push(@fields, $self->dbh->quote_identifier($key).'=?'); push(@placeholders, '?');
push(@data,$data->{$key}); push(@data,$data->{$key});
}
}
if ($fields[0] ne "") {
push(@data,$data->{$keyColumn});
$self->write("update $table set " . join(", ", @fields)
. " where " . $self->dbh->quote_identifier($keyColumn) . "=?", \@data);
} }
$self->write("replace into $table (" . join(",",@fields) . ") values (".join(",",@placeholders).")",\@data);
return $data->{$keyColumn}; return $data->{$keyColumn};
} }