Merge 'DBIx-Class-current' into 'find_compat'

r9322@fortuna (orig r1831):  jguenther | 2006-05-25 17:12:00 -0400
Squashed an extraneous warning in 82cascade_copy.t and fixed up 26dumper.t
r9323@fortuna (orig r1832):  jguenther | 2006-05-25 17:17:57 -0400
Changed tests to use DBICTest->init_schema() instead of DBICTest::init_schema()

diff --git a/t/19quotes.t b/t/19quotes.t
index 1275db1..be18f2d 100644 (file)
--- a/t/19quotes.t
+++ b/t/19quotes.t
@@ -14,7 +14,7 @@ BEGIN {
 use lib qw(t/lib);
 
 use_ok('DBICTest');
-DBICTest::init_schema();
+DBICTest->init_schema();
 
 DBICTest->schema->storage->sql_maker->quote_char("'");
 DBICTest->schema->storage->sql_maker->name_sep('.');

diff --git a/t/26dumper.t b/t/26dumper.t
index 6904fdc..ddb4a00 100644 (file)
--- a/t/26dumper.t
+++ b/t/26dumper.t
@@ -10,27 +10,30 @@ use lib qw(t/lib);
 BEGIN {
     eval "use DBD::SQLite";
     plan $ENV{DATA_DUMPER_TEST}
-        ? ( tests => 3 )
+        ? ( tests => 2 )
         : ( skip_all => 'Set $ENV{DATA_DUMPER_TEST} to run this test' );
 }
 
 
 use_ok('DBICTest');
-use_ok('DBICTest::HelperRels');
 
-
-my $rs = DBICTest::CD->search(
-           { 'artist.name' => 'We Are Goth',
-             'liner_notes.notes' => 'Kill Yourself!' },
-           { join => [ qw/artist liner_notes/ ] });
+my $schema = DBICTest->init_schema();
+my $rs = $schema->resultset('CD')->search({
+  'artist.name' => 'We Are Goth',
+  'liner_notes.notes' => 'Kill Yourself!',
+}, {
+  join => [ qw/artist liner_notes/ ],
+});
 
 Dumper($rs);
 
-$rs = DBICTest::CD->search(
-           { 'artist.name' => 'We Are Goth',
-             'liner_notes.notes' => 'Kill Yourself!' },
-           { join => [ qw/artist liner_notes/ ] });
+$rs = $schema->resultset('CD')->search({
+  'artist.name' => 'We Are Goth',
+  'liner_notes.notes' => 'Kill Yourself!',
+}, {
+  join => [ qw/artist liner_notes/ ],
+});
 
-cmp_ok( $rs + 0, '==', 1, "Single record in after death with dumper");
+cmp_ok( $rs->count(), '==', 1, "Single record in after death with dumper");
 
 1;

diff --git a/t/31stats.t b/t/31stats.t
index b358ef0..59aeb9e 100644 (file)
--- a/t/31stats.t
+++ b/t/31stats.t
@@ -14,7 +14,7 @@ BEGIN {
 use lib qw(t/lib);
 
 use_ok('DBICTest');
-DBICTest::init_schema();
+DBICTest->init_schema();
 
 my $cbworks = 0;
 

diff --git a/t/64db.t b/t/64db.t
index 5208614..d9c03aa 100644 (file)
--- a/t/64db.t
+++ b/t/64db.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 3;
 

diff --git a/t/65multipk.t b/t/65multipk.t
index 5cea1fd..4499b49 100644 (file)
--- a/t/65multipk.t
+++ b/t/65multipk.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 4;
 

diff --git a/t/66relationship.t b/t/66relationship.t
index 45ed343..dce68f7 100644 (file)
--- a/t/66relationship.t
+++ b/t/66relationship.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 32;
 

diff --git a/t/67pager.t b/t/67pager.t
index 85b1e8d..267927d 100644 (file)
--- a/t/67pager.t
+++ b/t/67pager.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 12;
 

diff --git a/t/68inflate.t b/t/68inflate.t
index 3906a02..b730253 100644 (file)
--- a/t/68inflate.t
+++ b/t/68inflate.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 eval { require DateTime };
 plan skip_all => "Need DateTime for inflation tests" if $@;

diff --git a/t/68inflate_has_a.t b/t/68inflate_has_a.t
index 266585a..1346ce5 100644 (file)
--- a/t/68inflate_has_a.t
+++ b/t/68inflate_has_a.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 eval { require DateTime };
 plan skip_all => "Need DateTime for inflation tests" if $@;

diff --git a/t/68inflate_serialize.t b/t/68inflate_serialize.t
index b51f961..5eed843 100644 (file)
--- a/t/68inflate_serialize.t
+++ b/t/68inflate_serialize.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 use Data::Dumper;
 

diff --git a/t/69update.t b/t/69update.t
index 70d7038..3372b4f 100644 (file)
--- a/t/69update.t
+++ b/t/69update.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 BEGIN {
         eval "use DBD::SQLite";

diff --git a/t/70auto.t b/t/70auto.t
index b108369..440c943 100644 (file)
--- a/t/70auto.t
+++ b/t/70auto.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 2;
 

diff --git a/t/75limit.t b/t/75limit.t
index 98d3b64..0fc7e3a 100644 (file)
--- a/t/75limit.t
+++ b/t/75limit.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 BEGIN {
     eval "use DBD::SQLite";

diff --git a/t/76joins.t b/t/76joins.t
index 069626a..c697254 100644 (file)
--- a/t/76joins.t
+++ b/t/76joins.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 use IO::File;
 

diff --git a/t/77join_count.t b/t/77join_count.t
index 499b08f..f46ad04 100644 (file)
--- a/t/77join_count.t
+++ b/t/77join_count.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 eval "use DBD::SQLite";
 plan skip_all => 'needs DBD::SQLite for testing' if $@;

diff --git a/t/78self_referencial.t b/t/78self_referencial.t
index 5759aca..640cbc2 100644 (file)
--- a/t/78self_referencial.t
+++ b/t/78self_referencial.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 # this test will check to see if you can have 2 columns
 # in the same class pointing at the same other class

diff --git a/t/79uuid.t b/t/79uuid.t
index 04fcca6..1a3061d 100644 (file)
--- a/t/79uuid.t
+++ b/t/79uuid.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 eval 'use Data::UUID ; 1'
   or plan skip_all => 'Install Data::UUID run this test';

diff --git a/t/80unique.t b/t/80unique.t
index 9d7634c..30767d2 100644 (file)
--- a/t/80unique.t
+++ b/t/80unique.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 34;
 

diff --git a/t/81transactions.t b/t/81transactions.t
index c9d9c62..847963e 100644 (file)
--- a/t/81transactions.t
+++ b/t/81transactions.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 39;
 

diff --git a/t/82cascade_copy.t b/t/82cascade_copy.t
index e5048a1..26b8425 100644 (file)
--- a/t/82cascade_copy.t
+++ b/t/82cascade_copy.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 4;
 my $artist = $schema->resultset('Artist')->find(1);
@@ -14,7 +14,7 @@ my $artist_cds = $artist->search_related('cds');
 my $cover_band;
 
 {
-  no warnings 'redefine';
+  no warnings qw(redefine once);
   local *DBICTest::Artist::result_source_instance = \&DBICTest::Schema::Artist::result_source_instance;
 
   $cover_band = $artist->copy;

diff --git a/t/83cache.t b/t/83cache.t
index 39f782a..78113b3 100644 (file)
--- a/t/83cache.t
+++ b/t/83cache.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 my $queries;
 $schema->storage->debugcb( sub{ $queries++ } );

diff --git a/t/84serialize.t b/t/84serialize.t
index d79acba..a8cedf0 100644 (file)
--- a/t/84serialize.t
+++ b/t/84serialize.t
@@ -6,7 +6,7 @@ use lib qw(t/lib);
 use DBICTest;
 use Storable;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 1;
 

diff --git a/t/85utf8.t b/t/85utf8.t
index c0f39ed..562efb4 100644 (file)
--- a/t/85utf8.t
+++ b/t/85utf8.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 eval 'use Encode ; 1'
     or plan skip_all => 'Install Encode run this test';

diff --git a/t/86might_have.t b/t/86might_have.t
index 1d4af78..81cbf84 100644 (file)
--- a/t/86might_have.t
+++ b/t/86might_have.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 my $queries;
 #$schema->storage->debugfh(IO::File->new('t/var/temp.trace', 'w'));

diff --git a/t/87ordered.t b/t/87ordered.t
index 1e4f33a..b1d484c 100644 (file)
--- a/t/87ordered.t
+++ b/t/87ordered.t
@@ -6,7 +6,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 321;
 

diff --git a/t/88result_set_column.t b/t/88result_set_column.t
index 5ed86d4..936a0a7 100644 (file)
--- a/t/88result_set_column.t
+++ b/t/88result_set_column.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 plan tests => 8; 
 

diff --git a/t/89dbicadmin.t b/t/89dbicadmin.t
index a411eb7..0b1d1f5 100644 (file)
--- a/t/89dbicadmin.t
+++ b/t/89dbicadmin.t
@@ -6,7 +6,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
 eval 'require JSON';
 plan skip_all => 'Install JSON to run this test' if ($@);

diff --git a/t/cdbi-sweet-t/08pager.t b/t/cdbi-sweet-t/08pager.t
index e105932..71ccaed 100644 (file)
--- a/t/cdbi-sweet-t/08pager.t
+++ b/t/cdbi-sweet-t/08pager.t
@@ -16,7 +16,7 @@ BEGIN {
 use lib 't/lib';
 
 use_ok('DBICTest');
-DBICTest::init_schema();
+DBICTest->init_schema();
 
 DBICTest::CD->load_components(qw/CDBICompat::Pager/);