[mb-commits] r11009 - in mb_server/branches/TemplateToolkit/lib: . MusicBrainz/Server MusicBrainz/Server/Form/User
root at musicbrainz.org
root at musicbrainz.org
Sat Jan 10 01:36:08 UTC 2009
Author: acid2
Date: 2009-01-10 01:36:08 +0000 (Sat, 10 Jan 2009)
New Revision: 11009
Modified:
mb_server/branches/TemplateToolkit/lib/MusicBrainz.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Country.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Editor.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/Preferences.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Label.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Language.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Script.pm
mb_server/branches/TemplateToolkit/lib/Sql.pm
mb_server/branches/TemplateToolkit/lib/Statistic.pm
mb_server/branches/TemplateToolkit/lib/TableBase.pm
Log:
Fix regressions in dbh accessor refactoring
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -840,7 +840,7 @@
if ($obj)
{
- $$obj->dbh($this->GetDBH) if $$obj;
+ $$obj->dbh($this->dbh) if $$obj;
return $$obj;
}
@@ -860,7 +860,7 @@
MusicBrainz::Server::Cache->set($key, \$obj);
MusicBrainz::Server::Cache->set($obj->_GetMBIDCacheKey($obj->mbid), \$obj)
if $obj;
- $obj->dbh($this->GetDBH) if $obj;
+ $obj->dbh($this->dbh) if $obj;
return $obj;
}
@@ -876,7 +876,7 @@
if ($obj)
{
- $$obj->dbh($this->GetDBH) if $$obj;
+ $$obj->dbh($this->dbh) if $$obj;
return $$obj;
}
@@ -907,7 +907,7 @@
MusicBrainz::Server::Cache->set($key, \$obj);
MusicBrainz::Server::Cache->set($obj->_id_cache_key($obj->id), \$obj)
if $obj;
- $obj->dbh($this->GetDBH) if $obj;
+ $obj->dbh($this->dbh) if $obj;
return $obj;
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Country.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Country.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Country.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -57,7 +57,7 @@
if ($obj)
{
- $$obj->dbh($self->GetDBH) if $$obj;
+ $$obj->dbh($self->dbh) if $$obj;
return $$obj;
}
@@ -73,7 +73,7 @@
# We can't store DBH in the cache...
delete $obj->{DBH} if $obj;
MusicBrainz::Server::Cache->set($key, \$obj);
- $obj->dbh($self->GetDBH) if $obj;
+ $obj->dbh($self->dbh) if $obj;
return $obj;
}
@@ -88,7 +88,7 @@
if ($obj)
{
- $_->dbh($self->GetDBH) for @$obj;
+ $_->dbh($self->dbh) for @$obj;
return @$obj;
}
@@ -104,7 +104,7 @@
# We can't store DBH in the cache...
delete $_->{DBH} for @list;
MusicBrainz::Server::Cache->set($key, \@list);
- $_->dbh($self->GetDBH) for @list;
+ $_->dbh($self->dbh) for @list;
return @list;
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Editor.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Editor.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Editor.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -231,7 +231,7 @@
if ($obj)
{
- $$obj->dbh($this->GetDBH) if $$obj;
+ $$obj->dbh($this->dbh) if $$obj;
return $$obj;
}
@@ -249,7 +249,7 @@
MusicBrainz::Server::Cache->set($key, \$obj);
MusicBrainz::Server::Cache->set($obj->_name_cache_key($obj->name), \$obj)
if $obj;
- $obj->dbh($this->GetDBH) if $obj;
+ $obj->dbh($this->dbh) if $obj;
return $obj;
}
@@ -266,7 +266,7 @@
if ($obj)
{
- $$obj->dbh($this->GetDBH) if $$obj;
+ $$obj->dbh($this->dbh) if $$obj;
return $$obj;
}
@@ -283,7 +283,7 @@
delete $obj->{DBH} if $obj;
MusicBrainz::Server::Cache->set($key, \$obj);
MusicBrainz::Server::Cache->set($obj->_id_cache_key($obj->id), \$obj) if $obj;
- $obj->dbh($this->GetDBH) if $obj;
+ $obj->dbh($this->dbh) if $obj;
return $obj;
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/Preferences.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/Preferences.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/Preferences.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -225,7 +225,7 @@
my $mb = new MusicBrainz;
$mb->Login();
- $self->item->dbh($mb->GetDBH);
+ $self->item->dbh($mb->dbh);
for my $field ($self->fields)
{
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Label.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Label.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Label.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -733,7 +733,7 @@
if ($obj)
{
- $$obj->dbh($this->GetDBH) if $$obj;
+ $$obj->dbh($this->dbh) if $$obj;
return $$obj;
}
@@ -752,7 +752,7 @@
MusicBrainz::Server::Cache->set($key, \$obj);
MusicBrainz::Server::Cache->set($obj->_GetMBIDCacheKey($obj->mbid), \$obj)
if $obj;
- $obj->dbh($this->GetDBH) if $obj;
+ $obj->dbh($this->dbh) if $obj;
return $obj;
}
@@ -768,7 +768,7 @@
if ($obj)
{
- $$obj->dbh($this->GetDBH) if $$obj;
+ $$obj->dbh($this->dbh) if $$obj;
return $$obj;
}
@@ -799,7 +799,7 @@
MusicBrainz::Server::Cache->set($key, \$obj);
MusicBrainz::Server::Cache->set($obj->_id_cache_key($obj->id), \$obj)
if $obj;
- $obj->dbh($this->GetDBH) if $obj;
+ $obj->dbh($this->dbh) if $obj;
return $obj;
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Language.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Language.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Language.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -63,7 +63,7 @@
if ($obj)
{
- $$obj->dbh($self->GetDBH) if $$obj;
+ $$obj->dbh($self->dbh) if $$obj;
return $$obj;
}
@@ -79,7 +79,7 @@
# We can't store DBH in the cache...
delete $obj->{DBH} if $obj;
MusicBrainz::Server::Cache->set($key, \$obj);
- $obj->dbh($self->GetDBH) if $obj;
+ $obj->dbh($self->dbh) if $obj;
return $obj;
}
@@ -104,7 +104,7 @@
{
@$obj = grep { $_->{frequency} >= $minfreq or $_->{id} == $include } @$obj
if defined $minfreq;
- $_->dbh($self->GetDBH) for @$obj;
+ $_->dbh($self->dbh) for @$obj;
return @$obj;
}
@@ -121,7 +121,7 @@
# We can't store DBH in the cache...
delete $_->{DBH} for @list;
MusicBrainz::Server::Cache->set($key, \@list);
- $_->dbh($self->GetDBH) for @list;
+ $_->dbh($self->dbh) for @list;
@list = grep { $_->{frequency} >= $minfreq or $_->{id} == $include } @list
if defined $minfreq;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Script.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Script.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Script.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -61,7 +61,7 @@
if ($obj)
{
- $$obj->dbh($self->GetDBH) if $$obj;
+ $$obj->dbh($self->dbh) if $$obj;
return $$obj;
}
@@ -77,7 +77,7 @@
# We can't store DBH in the cache...
delete $obj->{DBH} if $obj;
MusicBrainz::Server::Cache->set($key, \$obj);
- $obj->dbh($self->GetDBH) if $obj;
+ $obj->dbh($self->dbh) if $obj;
return $obj;
}
@@ -101,7 +101,7 @@
{
@$obj = grep { $_->{frequency} >= $minfreq or $_->{id} == $include } @$obj
if defined $minfreq;
- $_->dbh($self->GetDBH) for @$obj;
+ $_->dbh($self->dbh) for @$obj;
return @$obj;
}
@@ -118,7 +118,7 @@
# We can't store DBH in the cache...
delete $_->{DBH} for @list;
MusicBrainz::Server::Cache->set($key, \@list);
- $_->dbh($self->GetDBH) for @list;
+ $_->dbh($self->dbh) for @list;
@list = grep { $_->{frequency} >= $minfreq or $_->{id} == $include } @list
if defined $minfreq;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -46,16 +46,12 @@
sub dbh
{
- my ($self) = @_;
+ my ($self, $new_value) = @_;
+
+ if (defined $new_value) { $self->{DBH} = $new_value; }
return $self->{DBH};
}
-sub dbh
-{
- my ($self, $new_value) = @_;
- $self->{DBH} = $new_value;
-}
-
sub Login
{
my ($this, %opts) = @_;
Modified: mb_server/branches/TemplateToolkit/lib/Sql.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Sql.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/Sql.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -338,6 +338,8 @@
sub SelectSingleRowHash
{
my ($this, $query, @params) = @_;
+
+ croak "No DBH!" unless $this->{DBH};
my $row = eval
{
@@ -371,6 +373,8 @@
sub SelectSingleRowArray
{
my ($this, $query, @params) = @_;
+
+ croak "No DBH!" unless $this->{DBH};
my $row = eval
{
@@ -403,6 +407,8 @@
sub SelectSingleColumnArray
{
my ($this, $query, @params) = @_;
+
+ croak "No DBH!" unless $this->{DBH};
my $col = eval
{
@@ -441,6 +447,9 @@
sub SelectSingleValue
{
my ($this, $query, @params) = @_;
+
+ croak "No DBH!" unless $this->{DBH};
+
my $row = $this->SelectSingleRowArray($query, @params);
$row or return undef;
@@ -457,6 +466,8 @@
sub SelectListOfLists
{
my ($this, $query, @params) = @_;
+
+ croak "No DBH!" unless $this->{DBH};
my $data = eval
{
@@ -494,6 +505,8 @@
sub SelectListOfHashes
{
my ($this, $query, @params) = @_;
+
+ croak "No DBH!" unless $this->{DBH};
my $data = eval
{
Modified: mb_server/branches/TemplateToolkit/lib/Statistic.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Statistic.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/Statistic.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -35,16 +35,14 @@
return bless $this, $type;
}
-sub dbh {
- my ($self) = @_;
+sub dbh
+{
+ my ($self, $new_value) = @_;
+
+ if (defined $new_value) { $self->{DBH} = $new_value; }
return $self->{DBH};
}
-sub dbh {
- my ($self, $dbh) = @_;
- $self->{DBH} = $dbh;
-}
-
# Fetch current stat(s)
# $value = $stat->Fetch($name)
# @values = $stat->Fetch(@names)
Modified: mb_server/branches/TemplateToolkit/lib/TableBase.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/TableBase.pm 2009-01-10 01:25:54 UTC (rev 11008)
+++ mb_server/branches/TemplateToolkit/lib/TableBase.pm 2009-01-10 01:36:08 UTC (rev 11009)
@@ -61,20 +61,18 @@
{
my ($this, $row) = @_;
$row or return undef;
- $row->{DBH} = $this->GetDBH;
+ $row->{DBH} = $this->dbh;
bless $row, ref($this) || $this;
}
sub dbh
{
- return $_[0]->{DBH};
+ my ($self, $new_value) = @_;
+
+ if (defined $new_value) { $self->{DBH} = $new_value; }
+ return $self->{DBH};
}
-sub dbh
-{
- $_[0]->{DBH} = $_[1];
-}
-
sub id
{
my ($self, $new_id) = @_;
More information about the MusicBrainz-commits
mailing list