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

fixed a table name.

Browse source
This commit is contained in:
Matthew Wilson 2006-04-16 01:29:51 +00:00
parent 43ec03c6c0
commit b6f0e9e75c
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/upgrades/upgrade_6.8.8-6.99.0.pl
View file

@ -102,7 +102,7 @@ sub changeCache {
$session->db->write("alter table Folder add column visitorCacheTimeout int not null default 3600");
$session->db->write("alter table HttpProxy add column cacheTimeout int not null default 0");
$session->db->write("alter table SQLReport add column cacheTimeout int not null default 0");
$session->db->write("alter table Snippet add column cacheTimeout int not null default 3600");
$session->db->write("alter table snippet add column cacheTimeout int not null default 3600");
$session->db->write("alter table FileAsset add column cacheTimeout int not null default 3600");
$session->db->write("alter table Product add column cacheTimeout int not null default 3600");
$session->db->write("alter table SyndicatedContent add column cacheTimeout int not null default 3600");

2
lib/WebGUI/Operation/Statistics.pm
View file

@ -134,7 +134,7 @@ sub www_viewStatistics {
$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(147).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = $session->db->quickArray("select count(distinct assetId) from assetData where isPackage=1");
$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(794).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = $session->db->quickArray("select count(*) from template");
($data) = $session->db->quickArray("select count(distinct(assetId)) from template");
$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(792).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = $session->db->quickArray("select count(*) from userSession");
$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(146).':</td><td class="tableData">'.$data.'</td></tr>';

4
lib/WebGUI/SQL/ResultSet.pm
View file

@ -117,6 +117,7 @@ sub execute {
my $self = shift;
my $placeholders = shift || [];
my $sql = $self->{_sql};
$self->db->session->errorHandler->query($sql,$placeholders);
$self->sth->execute(@{ $placeholders }) or $self->db->session->errorHandler->fatal("Couldn't execute prepared statement: $sql : With place holders: ".join(", ", @{$placeholders}).". Root cause: ". $self->errorMessage);
}
@ -203,7 +204,6 @@ sub prepare {
my $class = shift;
my $sql = shift;
my $db = shift;
$db->session->errorHandler->query($sql);
my $sth = $db->dbh->prepare($sql) or $db->session->errorHandler->fatal("Couldn't prepare statement: ".$sql." : ". $db->dbh->errstr);
bless {_sth => $sth, _sql => $sql, _db=>$db}, $class;
}
@ -292,7 +292,7 @@ sub unconditionalRead {
my $sql = shift;
my $db = shift;
my $placeholders = shift;
$db->session->errorHandler->query($sql);
$db->session->errorHandler->query($sql,$placeholders);
my $sth = $db->dbh->prepare($sql) or $db->session->errorHandler->warn("Unconditional read failed: ".$sql." : ".$db->dbh->errstr);
if ($sth) {
$sth->execute(@$placeholders) or $db->session->errorHandler->warn("Unconditional read failed: ".$sql." : ".$sth->errstr);

5
lib/WebGUI/Session/ErrorHandler.pm
View file

@ -336,8 +336,11 @@ A sql statement string.
sub query {
my $self = shift;
my $query = shift;
my $placeholders = shift;
$self->{_queryCount}++;
$self->debug("query ".$self->{_queryCount}.': '.shift);
my $plac = scalar(@{$placeholders}) ? "\n&nbsp;&nbsp;with placeholders:&nbsp;&nbsp;['".join("', '",@{$placeholders})."']" : '';
$self->debug("query ".$self->{_queryCount}.': '.$query.$plac);
}