r11788 - in mb_server/trunk: lib/MusicBrainz/Server/Data t

[root-97]

Author: acid2
Date: 2009-06-29 13:56:42 +0000 (Mon, 29 Jun 2009)
New Revision: 11788

Added:
   mb_server/trunk/lib/MusicBrainz/Server/Data/SelectAll.pm
Modified:
   mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroupType.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm
   mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm
   mb_server/trunk/t/data_artisttype.t
   mb_server/trunk/t/data_country.t
   mb_server/trunk/t/data_gender.t
   mb_server/trunk/t/data_labeltype.t
   mb_server/trunk/t/data_language.t
   mb_server/trunk/t/data_mediumformat.t
   mb_server/trunk/t/data_releasegrouptype.t
   mb_server/trunk/t/data_releasepackaging.t
   mb_server/trunk/t/data_releasestatus.t
   mb_server/trunk/t/data_script.t
   mb_server/trunk/t/data_worktype.t
Log:
Merge 'get_all' function. See review 233

Merge branch 'select-all'

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -6,6 +6,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'at' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -6,6 +6,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'c' };
+with 'MusicBrainz::Server::Data::SelectAll' => { order_by => [ 'name ASC' ] };
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -10,6 +10,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'g' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -6,6 +6,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'lt' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -7,6 +7,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'lng' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -6,6 +6,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'mf' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroupType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroupType.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroupType.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -5,6 +5,7 @@
 use MusicBrainz::Server::Data::Utils qw( load_subobjects );
 
 extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -6,6 +6,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'rp' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -6,6 +6,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'rs' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -7,6 +7,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'scr' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm 2009-06-29 13:56:42 UTC (rev 11788)
@@ -6,6 +6,7 @@
 
 extends 'MusicBrainz::Server::Data::Entity';
 with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'wt' };
+with 'MusicBrainz::Server::Data::SelectAll';
 
 sub _table
 {

Modified: mb_server/trunk/t/data_artisttype.t
===================================================================
--- mb_server/trunk/t/data_artisttype.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_artisttype.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 9;
+use Test::More tests => 14;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::ArtistType';
 
 use MusicBrainz::Server::Context;
@@ -25,3 +26,10 @@
 
 is ( $ats->{2}->id, 2 );
 is ( $ats->{2}->name, "Group" );
+
+does_ok($at_data, 'MusicBrainz::Server::Data::SelectAll');
+my @types = $at_data->get_all;
+is(@types, 3);
+is($types[0]->id, 1);
+is($types[1]->id, 2);
+is($types[2]->id, 3);

Modified: mb_server/trunk/t/data_country.t
===================================================================
--- mb_server/trunk/t/data_country.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_country.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 13;
+use Test::More tests => 17;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::Country';
 
 use MusicBrainz::Server::Context;
@@ -29,3 +30,9 @@
 is ( $countries->{2}->id, 2 );
 is ( $countries->{2}->iso_code, "US" );
 is ( $countries->{2}->name, "United States" );
+
+does_ok($country_data, 'MusicBrainz::Server::Data::SelectAll');
+my @cts = $country_data->get_all;
+is(@cts, 2);
+is($cts[0]->id, 1);
+is($cts[1]->id, 2);

Modified: mb_server/trunk/t/data_gender.t
===================================================================
--- mb_server/trunk/t/data_gender.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_gender.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 16;
+use Test::More tests => 20;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::Gender';
 
 use MusicBrainz::Server::Entity::Gender;
@@ -27,6 +28,12 @@
 is ( $genders->{2}->id, 2 );
 is ( $genders->{2}->name, "Female" );
 
+does_ok($gender_data, 'MusicBrainz::Server::Data::SelectAll');
+my @gs = $gender_data->get_all;
+is(@gs, 2);
+is($gs[0]->id, 1);
+is($gs[1]->id, 2);
+
 my $sql = Sql->new($c->mb->dbh);
 $sql->Begin;
 

Modified: mb_server/trunk/t/data_labeltype.t
===================================================================
--- mb_server/trunk/t/data_labeltype.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_labeltype.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 5;
+use Test::More tests => 9;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::LabelType';
 
 use MusicBrainz::Server::Context;
@@ -18,3 +19,9 @@
 my $lts = $lt_data->get_by_ids(1);
 is ( $lts->{1}->id, 1 );
 is ( $lts->{1}->name, "Production" );
+
+does_ok($lt_data, 'MusicBrainz::Server::Data::SelectAll');
+my @types = $lt_data->get_all;
+is(@types, 2);
+is($types[0]->id, 1);
+is($types[1]->id, 2);

Modified: mb_server/trunk/t/data_language.t
===================================================================
--- mb_server/trunk/t/data_language.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_language.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 11;
+use Test::More tests => 14;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::Language';
 
 use MusicBrainz::Server::Context;
@@ -24,3 +25,8 @@
 is ( $languages->{1}->iso_code_3b, "ger" );
 is ( $languages->{1}->iso_code_2, "de" );
 is ( $languages->{1}->name, "German" );
+
+does_ok($language_data, 'MusicBrainz::Server::Data::SelectAll');
+my @languages = $language_data->get_all;
+is(@languages, 1);
+is($languages[0]->id, 1);

Modified: mb_server/trunk/t/data_mediumformat.t
===================================================================
--- mb_server/trunk/t/data_mediumformat.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_mediumformat.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 9;
+use Test::More tests => 13;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::MediumFormat';
 
 use MusicBrainz::Server::Context;
@@ -25,3 +26,10 @@
 
 is ( $mfs->{2}->id, 2 );
 is ( $mfs->{2}->name, "Vinyl" );
+
+
+does_ok($mf_data, 'MusicBrainz::Server::Data::SelectAll');
+my @formats = $mf_data->get_all;
+is(@formats, 2);
+is($formats[0]->id, 1);
+is($formats[1]->id, 2);

Modified: mb_server/trunk/t/data_releasegrouptype.t
===================================================================
--- mb_server/trunk/t/data_releasegrouptype.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_releasegrouptype.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 9;
+use Test::More tests => 13;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::ReleaseGroupType';
 
 use MusicBrainz::Server::Context;
@@ -25,3 +26,9 @@
 
 is ( $rgts->{2}->id, 2 );
 is ( $rgts->{2}->name, "Single" );
+
+does_ok($rgt_data, 'MusicBrainz::Server::Data::SelectAll');
+my @types = $rgt_data->get_all;
+is(@types, 2);
+is($types[0]->id, 1);
+is($types[1]->id, 2);

Modified: mb_server/trunk/t/data_releasepackaging.t
===================================================================
--- mb_server/trunk/t/data_releasepackaging.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_releasepackaging.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 5;
+use Test::More tests => 8;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::ReleasePackaging';
 
 use MusicBrainz::Server::Context;
@@ -18,3 +19,8 @@
 my $lts = $lt_data->get_by_ids(1);
 is ( $lts->{1}->id, 1 );
 is ( $lts->{1}->name, "Jewel Case" );
+
+does_ok($lt_data, 'MusicBrainz::Server::Data::SelectAll');
+my @types = $lt_data->get_all;
+is(@types, 1);
+is($types[0]->id, 1);

Modified: mb_server/trunk/t/data_releasestatus.t
===================================================================
--- mb_server/trunk/t/data_releasestatus.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_releasestatus.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 5;
+use Test::More tests => 8;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::ReleaseStatus';
 
 use MusicBrainz::Server::Context;
@@ -18,3 +19,8 @@
 my $lts = $lt_data->get_by_ids(1);
 is ( $lts->{1}->id, 1 );
 is ( $lts->{1}->name, "Official" );
+
+does_ok($lt_data, 'MusicBrainz::Server::Data::SelectAll');
+my @status = $lt_data->get_all;
+is(@status, 1);
+is($status[0]->id, 1);

Modified: mb_server/trunk/t/data_script.t
===================================================================
--- mb_server/trunk/t/data_script.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_script.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 7;
+use Test::More tests => 10;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::Script';
 
 use MusicBrainz::Server::Context;
@@ -20,3 +21,8 @@
 is ( $scripts->{1}->id, 1 );
 is ( $scripts->{1}->iso_code, "Ugar" );
 is ( $scripts->{1}->name, "Ugaritic" );
+
+does_ok($script_data, 'MusicBrainz::Server::Data::SelectAll');
+my @scripts = $script_data->get_all;
+is(@scripts, 1);
+is($scripts[0]->id, 1);

Modified: mb_server/trunk/t/data_worktype.t
===================================================================
--- mb_server/trunk/t/data_worktype.t 2009-06-28 23:10:29 UTC (rev 11787)
+++ mb_server/trunk/t/data_worktype.t 2009-06-29 13:56:42 UTC (rev 11788)
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 9;
+use Test::More tests => 13;
+use Test::Moose;
 use_ok 'MusicBrainz::Server::Data::WorkType';
 
 use MusicBrainz::Server::Context;
@@ -25,3 +26,9 @@
 
 is ( $wts->{2}->id, 2 );
 is ( $wts->{2}->name, "Symphony" );
+
+does_ok($wt_data, 'MusicBrainz::Server::Data::SelectAll');
+my @types = $wt_data->get_all;
+is(@types, 2);
+is($types[0]->id, 1);
+is($types[1]->id, 2);


_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits