Merge 'DBIx-Class-current' into 'reorganize_tests'
Matt S Trout [Thu, 25 May 2006 16:19:21 +0000 (09:19 -0700)]
r1813@moss (orig r1812):  matthewt | 2006-05-25 11:19:21 -0700
piss off

92 files changed:
t/19quotes.t
t/31stats.t
t/53delete_related.t
t/60core.t [moved from t/run/01core.tl with 99% similarity]
t/64db.t [moved from t/run/04db.tl with 100% similarity]
t/65multipk.t [moved from t/run/05multipk.tl with 100% similarity]
t/66relationship.t [moved from t/run/06relationship.tl with 100% similarity]
t/67pager.t [moved from t/run/07pager.tl with 100% similarity]
t/68inflate.t [moved from t/run/08inflate.tl with 100% similarity]
t/68inflate_has_a.t [moved from t/run/08inflate_has_a.tl with 100% similarity]
t/68inflate_serialize.t [moved from t/run/08inflate_serialize.tl with 100% similarity]
t/69update.t [moved from t/run/09update.tl with 100% similarity]
t/70auto.t [moved from t/run/10auto.tl with 100% similarity]
t/71mysql.t [moved from t/run/11mysql.tl with 100% similarity]
t/72pg.t [moved from t/run/12pg.tl with 96% similarity]
t/73oracle.t [moved from t/run/13oracle.tl with 100% similarity]
t/745db2.t [moved from t/run/145db2.tl with 95% similarity]
t/746db2_400.t [moved from t/run/146db2_400.tl with 95% similarity]
t/74mssql.t [moved from t/run/14mssql.tl with 93% similarity]
t/75limit.t [moved from t/run/15limit.tl with 100% similarity]
t/76joins.t [moved from t/run/16joins.tl with 100% similarity]
t/77join_count.t [moved from t/run/17join_count.tl with 100% similarity]
t/78self_referencial.t [moved from t/run/18self_referencial.tl with 100% similarity]
t/79uuid.t [moved from t/run/19uuid.tl with 88% similarity]
t/80unique.t [moved from t/run/20unique.tl with 100% similarity]
t/81transactions.t [moved from t/run/21transactions.tl with 99% similarity]
t/82cascade_copy.t [moved from t/run/22cascade_copy.tl with 100% similarity]
t/83cache.t [moved from t/run/23cache.tl with 99% similarity]
t/84serialize.t [moved from t/run/24serialize.tl with 100% similarity]
t/85utf8.t [moved from t/run/25utf8.tl with 100% similarity]
t/86might_have.t [moved from t/run/26might_have.tl with 100% similarity]
t/86sqlt.t [moved from t/helperrels/26sqlt.t with 99% similarity]
t/87ordered.t [moved from t/run/27ordered.tl with 99% similarity]
t/88result_set_column.t [moved from t/run/28result_set_column.tl with 99% similarity]
t/89dbicadmin.t [moved from t/run/29dbicadmin.tl with 100% similarity]
t/89inflate_datetime.t [moved from t/run/29inflate_datetime.tl with 74% similarity]
t/90ensure_class_loaded.t [moved from t/run/30ensure_class_loaded.tl with 87% similarity]
t/90join_torture.t [moved from t/run/30join_torture.tl with 87% similarity]
t/cdbi-sweet-t/08pager.t
t/helperrels/01core.t [deleted file]
t/helperrels/04db.t [deleted file]
t/helperrels/05multipk.t [deleted file]
t/helperrels/06relationship.t [deleted file]
t/helperrels/07pager.t [deleted file]
t/helperrels/08inflate.t [deleted file]
t/helperrels/08inflate_has_a.t [deleted file]
t/helperrels/08inflate_serialize.t [deleted file]
t/helperrels/09update.t [deleted file]
t/helperrels/10auto.t [deleted file]
t/helperrels/11mysql.t [deleted file]
t/helperrels/12pg.t [deleted file]
t/helperrels/13oracle.t [deleted file]
t/helperrels/145db2.t [deleted file]
t/helperrels/146db2_400.t [deleted file]
t/helperrels/14mssql.t [deleted file]
t/helperrels/15limit.t [deleted file]
t/helperrels/16joins.t [deleted file]
t/helperrels/17join_count.t [deleted file]
t/helperrels/18self_referencial.t [deleted file]
t/helperrels/19uuid.t [deleted file]
t/helperrels/20unique.t [deleted file]
t/helperrels/21transactions.t [deleted file]
t/helperrels/22cascade_copy.t [deleted file]
t/helperrels/23cache.t [deleted file]
t/helperrels/24serialize.t [deleted file]
t/helperrels/25utf8.t [deleted file]
t/helperrels/26might_have.t [deleted file]
t/helperrels/27ordered.t [deleted file]
t/helperrels/28result_set_column.t [deleted file]
t/helperrels/29dbicadmin.t [deleted file]
t/helperrels/29inflate_datetime.t [deleted file]
t/helperrels/30ensure_class_loaded.t [deleted file]
t/helperrels/30join_torture.t [deleted file]
t/lib/DBICTest.pm
t/lib/DBICTest/Schema.pm
t/lib/DBICTest/Schema/Artist.pm
t/lib/DBICTest/Schema/ArtistUndirectedMap.pm
t/lib/DBICTest/Schema/Bookmark.pm
t/lib/DBICTest/Schema/CD.pm
t/lib/DBICTest/Schema/CD_to_Producer.pm
t/lib/DBICTest/Schema/Employee.pm
t/lib/DBICTest/Schema/Event.pm
t/lib/DBICTest/Schema/Link.pm
t/lib/DBICTest/Schema/OneKey.pm
t/lib/DBICTest/Schema/Relationships.pm [deleted file]
t/lib/DBICTest/Schema/SelfRef.pm
t/lib/DBICTest/Schema/SelfRefAlias.pm
t/lib/DBICTest/Schema/Tag.pm
t/lib/DBICTest/Schema/Track.pm
t/lib/DBICTest/Schema/TreeLike.pm
t/lib/DBICTest/Schema/TwoKeyTreeLike.pm
t/lib/DBICTest/Schema/TwoKeys.pm

index 7a85075..1275db1 100644 (file)
@@ -1,4 +1,6 @@
 use strict;
+use warnings;
+
 use Test::More;
 use IO::File;
 
@@ -6,14 +8,13 @@ BEGIN {
     eval "use DBD::SQLite";
     plan $@
         ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 7 );
+        : ( tests => 6 );
 }
 
 use lib qw(t/lib);
 
 use_ok('DBICTest');
-
-use_ok('DBICTest::HelperRels');
+DBICTest::init_schema();
 
 DBICTest->schema->storage->sql_maker->quote_char("'");
 DBICTest->schema->storage->sql_maker->name_sep('.');
index a478d28..b358ef0 100644 (file)
@@ -8,13 +8,13 @@ BEGIN {
     eval "use DBD::SQLite";
     plan $@
         ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 13 );
+        : ( tests => 12 );
 }
 
 use lib qw(t/lib);
 
 use_ok('DBICTest');
-use_ok('DBICTest::HelperRels');
+DBICTest::init_schema();
 
 my $cbworks = 0;
 
index f193566..e0cfe12 100644 (file)
@@ -3,11 +3,10 @@ use strict;
 use warnings;
 use lib qw(t/lib);
 use DBICTest;
-use DBICTest::BasicRels;
 
 plan tests => 7;
 
-my $schema = DBICTest->schema;
+my $schema = DBICTest->init_schema();
 my $total_cds = $schema->resultset('CD')->count;
 cmp_ok($total_cds, '>', 0, 'need cd records');
 
@@ -28,3 +27,4 @@ cmp_ok($artist2_cds, '<', $total_cds, 'need more cds than related cds');
 
 ok($artist2->delete_related('cds', {title => {like => '%'}}));
 cmp_ok($schema->resultset('CD')->count, '==', ($total_cds - $artist2_cds), 'too many cds were deleted');
+
similarity index 99%
rename from t/run/01core.tl
rename to t/60core.t
index c3c593f..6ac90c7 100644 (file)
@@ -5,9 +5,9 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-my $schema = DBICTest::init_schema();
+my $schema = DBICTest->init_schema();
 
-plan tests => 58;
+plan tests => 60;
 
 # figure out if we've got a version of sqlite that is older than 3.2.6, in
 # which case COUNT(DISTINCT()) doesn't work
similarity index 100%
rename from t/run/04db.tl
rename to t/64db.t
similarity index 100%
rename from t/run/05multipk.tl
rename to t/65multipk.t
similarity index 100%
rename from t/run/06relationship.tl
rename to t/66relationship.t
similarity index 100%
rename from t/run/07pager.tl
rename to t/67pager.t
similarity index 100%
rename from t/run/08inflate.tl
rename to t/68inflate.t
similarity index 100%
rename from t/run/08inflate_has_a.tl
rename to t/68inflate_has_a.t
similarity index 100%
rename from t/run/09update.tl
rename to t/69update.t
similarity index 100%
rename from t/run/10auto.tl
rename to t/70auto.t
similarity index 100%
rename from t/run/11mysql.tl
rename to t/71mysql.t
similarity index 96%
rename from t/run/12pg.tl
rename to t/72pg.t
index 81aae04..3e55bcb 100644 (file)
+++ b/t/72pg.t
@@ -10,7 +10,7 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/};
 #warn "$dsn $user $pass";
 
 plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
-  . ' (note: creates and drops tables named artist and casecheck!)' unless ($dsn && $user);
+ . ' (note: creates and drops tables named artist and casecheck!)' unless ($dsn && $user);
 
 plan tests => 8;
 
@@ -19,7 +19,6 @@ DBICTest::Schema->compose_connection('PgTest' => $dsn, $user, $pass);
 my $dbh = PgTest->schema->storage->dbh;
 PgTest->schema->source("Artist")->name("testschema.artist");
 $dbh->do("CREATE SCHEMA testschema;");
-
 $dbh->do("CREATE TABLE testschema.artist (artistid serial PRIMARY KEY, name VARCHAR(100), charfield CHAR(10));");
 ok ( $dbh->do('CREATE TABLE testschema.casecheck (id serial PRIMARY KEY, "name" VARCHAR(1), "NAME" VARCHAR(2), "UC_NAME" VARCHAR(3));'), 'Creation of casecheck table');
 
similarity index 100%
rename from t/run/13oracle.tl
rename to t/73oracle.t
similarity index 95%
rename from t/run/145db2.tl
rename to t/745db2.t
index 36e5e8c..ffb7a0b 100644 (file)
@@ -9,7 +9,7 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_DB2_${_}" } qw/DSN USER PASS/};
 
 #warn "$dsn $user $pass";
 
-plan skip_all, 'Set $ENV{DBICTEST_DB2_DSN}, _USER and _PASS to run this test'
+plan skip_all => 'Set $ENV{DBICTEST_DB2_DSN}, _USER and _PASS to run this test'
   unless ($dsn && $user);
 
 plan tests => 6;
similarity index 95%
rename from t/run/146db2_400.tl
rename to t/746db2_400.t
index 6c2344c..558ca62 100644 (file)
@@ -12,7 +12,7 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_DB2_400_${_}" } qw/DSN USER PASS/
 # Probably best to pass the DBQ option in the DSN to specify a specific
 # libray.  Something like:
 # DBICTEST_DB2_400_DSN='dbi:ODBC:dsn=MyAS400;DBQ=MYLIB'
-plan skip_all, 'Set $ENV{DBICTEST_DB2_400_DSN}, _USER and _PASS to run this test'
+plan skip_all => 'Set $ENV{DBICTEST_DB2_400_DSN}, _USER and _PASS to run this test'
   unless ($dsn && $user);
 
 plan tests => 6;
similarity index 93%
rename from t/run/14mssql.tl
rename to t/74mssql.t
index f21d9e2..c879ca6 100644 (file)
@@ -14,7 +14,7 @@ plan skip_all => 'Set $ENV{DBICTEST_MSSQL_DSN}, _USER and _PASS to run this test
 
 plan tests => 4;
 
-$schema->compose_connection( 'MSSQLTest' => $dsn, $user, $pass );
+DBICTest::Schema->compose_connection( 'MSSQLTest' => $dsn, $user, $pass );
 
 my $dbh = MSSQLTest->schema->storage->dbh;
 
similarity index 100%
rename from t/run/15limit.tl
rename to t/75limit.t
similarity index 100%
rename from t/run/16joins.tl
rename to t/76joins.t
similarity index 100%
rename from t/run/17join_count.tl
rename to t/77join_count.t
similarity index 88%
rename from t/run/19uuid.tl
rename to t/79uuid.t
index d4800d9..04fcca6 100644 (file)
@@ -8,7 +8,7 @@ use DBICTest;
 my $schema = DBICTest::init_schema();
 
 eval 'use Data::UUID ; 1'
-  or plan skip_all, 'Install Data::UUID run this test';
+  or plan skip_all => 'Install Data::UUID run this test';
 
 plan tests => 1;
 DBICTest::Schema::Artist->load_components('UUIDColumns');
similarity index 100%
rename from t/run/20unique.tl
rename to t/80unique.t
similarity index 99%
rename from t/run/21transactions.tl
rename to t/81transactions.t
index fe3c453..c9d9c62 100644 (file)
@@ -117,6 +117,7 @@ my $fail_code = sub {
 
   # Force txn_rollback() to throw an exception
   no warnings 'redefine';
+  no strict 'refs';
   local *{"DBIx::Class::Schema::txn_rollback"} = sub{die 'FAILED'};
 
   eval {
similarity index 100%
rename from t/run/22cascade_copy.tl
rename to t/82cascade_copy.t
similarity index 99%
rename from t/run/23cache.tl
rename to t/83cache.t
index a3c94c0..39f782a 100644 (file)
@@ -40,7 +40,7 @@ $rs->set_cache( $artists );
 
 is( scalar @{$rs->get_cache}, 2, 'set_cache() is functional' );
 
-$cd = $schema->resultset('CD')->find(1);
+my $cd = $schema->resultset('CD')->find(1);
 
 $rs->clear_cache;
 
similarity index 100%
rename from t/run/24serialize.tl
rename to t/84serialize.t
similarity index 100%
rename from t/run/25utf8.tl
rename to t/85utf8.t
similarity index 100%
rename from t/run/26might_have.tl
rename to t/86might_have.t
similarity index 99%
rename from t/helperrels/26sqlt.t
rename to t/86sqlt.t
index bdcd088..d01a630 100644 (file)
@@ -10,7 +10,7 @@ plan skip_all => 'SQL::Translator required' if $@;
 
 # do not taunt happy dave ball
 
-my $schema = DBICTest::Schema;
+my $schema = 'DBICTest::Schema';
 
 plan tests => 31;
 
@@ -179,6 +179,8 @@ sub check_fk {
  return 0;
 }
 
+my( $ondel, $onupd );
+
 sub check_unique {
  my ($selftable, $selfcol) = @_;
 
similarity index 99%
rename from t/run/27ordered.tl
rename to t/87ordered.t
index 7a4847e..1e4f33a 100644 (file)
@@ -42,6 +42,7 @@ sub hammer_rs {
     my $employee;
     my $count = $rs->count();
     my $position_column = $rs->result_class->position_column();
+    my $row;
 
     foreach my $position (1..$count) {
 
similarity index 99%
rename from t/run/28result_set_column.tl
rename to t/88result_set_column.t
index c062a23..5ed86d4 100644 (file)
@@ -9,6 +9,7 @@ my $schema = DBICTest::init_schema();
 
 plan tests => 8; 
 
+my $cd;
 my $rs = $cd = $schema->resultset("CD")->search({});
 
 my $rs_title = $rs->get_column('title');
similarity index 100%
rename from t/run/29dbicadmin.tl
rename to t/89dbicadmin.t
similarity index 74%
rename from t/run/29inflate_datetime.tl
rename to t/89inflate_datetime.t
index 0efc45a..254348a 100644 (file)
@@ -1,5 +1,11 @@
-sub run_tests {
-my $schema = shift;
+use strict;
+use warnings;  
+
+use Test::More;
+use lib qw(t/lib);
+use DBICTest;
+
+my $schema = DBICTest->init_schema();
 
 eval { require DateTime::Format::MySQL };
 plan skip_all => "Need DateTime::Format::MySQL for inflation tests" if $@;
@@ -13,6 +19,3 @@ isa_ok($event->starts_at, 'DateTime', 'DateTime returned');
 
 is($event->starts_at, '2006-04-25T22:24:33', 'Correct date/time');
 
-}
-
-1;
similarity index 87%
rename from t/run/30ensure_class_loaded.tl
rename to t/90ensure_class_loaded.t
index 8602565..8f66c2e 100644 (file)
@@ -1,3 +1,9 @@
+use strict;
+use warnings;  
+
+use Test::More;
+use lib qw(t/lib);
+use DBICTest;
 use Class::Inspector;
 
 BEGIN {
@@ -5,9 +11,8 @@ BEGIN {
   sub some_method {}
 }
 
-sub run_tests {
+my $schema = DBICTest->init_schema();
 
-my $schema = shift;
 plan tests => 6;
 
 ok(Class::Inspector->loaded('TestPackage::A'),
@@ -35,6 +40,5 @@ eval {
 ok(!$@, 'ensure_class_loaded detected an existing but non-loaded class');
 ok(Class::Inspector->loaded('DBICTest::FakeComponent'),
    'DBICTest::FakeComponent now loaded');
-}
 
 1;
similarity index 87%
rename from t/run/30join_torture.tl
rename to t/90join_torture.t
index 181a94e..eb66445 100644 (file)
@@ -1,5 +1,11 @@
-sub run_tests {
-my $schema = shift;
+use strict;
+use warnings;  
+
+use Test::More;
+use lib qw(t/lib);
+use DBICTest;
+
+my $schema = DBICTest->init_schema();
 
 plan tests => 4;
 
@@ -20,6 +26,4 @@ is($rs4_results[0]->cdid, 1, "correct artist returned");
 my $rs5 = $rs4->search({'tracks.title' => 'Sticky Honey'});
 is($rs5->count, 1, "search without using previous joins okay");
 
-}
-
 1;
index 9650315..e105932 100644 (file)
@@ -15,7 +15,8 @@ BEGIN {
 
 use lib 't/lib';
 
-use_ok('DBICTest::HelperRels');
+use_ok('DBICTest');
+DBICTest::init_schema();
 
 DBICTest::CD->load_components(qw/CDBICompat::Pager/);
 
diff --git a/t/helperrels/01core.t b/t/helperrels/01core.t
deleted file mode 100644 (file)
index 1829aef..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/01core.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/04db.t b/t/helperrels/04db.t
deleted file mode 100644 (file)
index 5051ac3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/04db.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/05multipk.t b/t/helperrels/05multipk.t
deleted file mode 100644 (file)
index fc5b046..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/05multipk.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/06relationship.t b/t/helperrels/06relationship.t
deleted file mode 100644 (file)
index c56d936..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/06relationship.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/07pager.t b/t/helperrels/07pager.t
deleted file mode 100644 (file)
index a0b192f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/07pager.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/08inflate.t b/t/helperrels/08inflate.t
deleted file mode 100644 (file)
index 9f1afb5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/08inflate.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/08inflate_has_a.t b/t/helperrels/08inflate_has_a.t
deleted file mode 100644 (file)
index 32641eb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/08inflate_has_a.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/08inflate_serialize.t b/t/helperrels/08inflate_serialize.t
deleted file mode 100644 (file)
index e0ca1d8..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/08inflate_serialize.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/09update.t b/t/helperrels/09update.t
deleted file mode 100644 (file)
index 05cc63e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/09update.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/10auto.t b/t/helperrels/10auto.t
deleted file mode 100644 (file)
index 94c0c7c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/10auto.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/11mysql.t b/t/helperrels/11mysql.t
deleted file mode 100644 (file)
index 397f961..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/11mysql.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/12pg.t b/t/helperrels/12pg.t
deleted file mode 100644 (file)
index 281289d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/12pg.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/13oracle.t b/t/helperrels/13oracle.t
deleted file mode 100644 (file)
index 25a6e51..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/13oracle.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/145db2.t b/t/helperrels/145db2.t
deleted file mode 100644 (file)
index c6925ef..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/145db2.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/146db2_400.t b/t/helperrels/146db2_400.t
deleted file mode 100644 (file)
index 655bc05..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/146db2_400.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/14mssql.t b/t/helperrels/14mssql.t
deleted file mode 100644 (file)
index b43847f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/14mssql.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/15limit.t b/t/helperrels/15limit.t
deleted file mode 100644 (file)
index fa22b73..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/15limit.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/16joins.t b/t/helperrels/16joins.t
deleted file mode 100644 (file)
index bf451e9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/16joins.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/17join_count.t b/t/helperrels/17join_count.t
deleted file mode 100644 (file)
index 531d9ff..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/17join_count.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/18self_referencial.t b/t/helperrels/18self_referencial.t
deleted file mode 100644 (file)
index 6cec715..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/18self_referencial.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/19uuid.t b/t/helperrels/19uuid.t
deleted file mode 100644 (file)
index 2d0d4cb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/19uuid.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/20unique.t b/t/helperrels/20unique.t
deleted file mode 100644 (file)
index 91eed2c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/20unique.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/21transactions.t b/t/helperrels/21transactions.t
deleted file mode 100644 (file)
index 5730483..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/21transactions.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/22cascade_copy.t b/t/helperrels/22cascade_copy.t
deleted file mode 100644 (file)
index bc124e1..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/22cascade_copy.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/23cache.t b/t/helperrels/23cache.t
deleted file mode 100644 (file)
index 73bc31a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/23cache.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/24serialize.t b/t/helperrels/24serialize.t
deleted file mode 100644 (file)
index bc51393..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/24serialize.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/25utf8.t b/t/helperrels/25utf8.t
deleted file mode 100644 (file)
index ad3fe14..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/25utf8.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/26might_have.t b/t/helperrels/26might_have.t
deleted file mode 100644 (file)
index d3ec615..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/26might_have.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/27ordered.t b/t/helperrels/27ordered.t
deleted file mode 100644 (file)
index 352a730..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/27ordered.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/28result_set_column.t b/t/helperrels/28result_set_column.t
deleted file mode 100644 (file)
index 105b5c7..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/28result_set_column.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/29dbicadmin.t b/t/helperrels/29dbicadmin.t
deleted file mode 100644 (file)
index ea5882e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/29dbicadmin.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/29inflate_datetime.t b/t/helperrels/29inflate_datetime.t
deleted file mode 100644 (file)
index aacf84a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/29inflate_datetime.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/30ensure_class_loaded.t b/t/helperrels/30ensure_class_loaded.t
deleted file mode 100644 (file)
index 6edbe80..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/30ensure_class_loaded.tl";
-run_tests(DBICTest->schema);
diff --git a/t/helperrels/30join_torture.t b/t/helperrels/30join_torture.t
deleted file mode 100644 (file)
index 1e85aeb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBICTest::HelperRels;
-
-require "t/run/30join_torture.tl";
-run_tests(DBICTest->schema);
index ca44f05..9dbbf55 100755 (executable)
@@ -4,23 +4,234 @@ package # hide from PAUSE
 use strict;
 use warnings;
 use DBICTest::Schema;
-use DBICTest::Schema::Relationships;
+
+=head1 NAME
+
+DBICTest - Library to be used by DBIx::Class test scripts.
+
+=head1 SYNOPSIS
+
+  use lib qw(t/lib);
+  use DBICTest;
+  use Test::More;
+  
+  my $schema = DBICTest->init_schema();
+
+=head1 DESCRIPTION
+
+This module provides the basic utilities to write tests against 
+DBIx::Class.
+
+=head1 METHODS
+
+=head2 init_schema
+
+  my $schema = DBICTest->init_schema(
+    no_deploy=>1,
+    no_populate=>1,
+  );
+
+This method removes the test SQLite database in t/var/DBIxClass.db 
+and then creates a new, empty database.
+
+This method will call deploy_schema() by default, unless the 
+no_deploy flag is set.
+
+Also, by default, this method will call populate_schema() by 
+default, unless the no_deploy or no_populate flags are set.
+
+=cut
 
 sub init_schema {
-  my $db_file = "t/var/DBIxClass.db";
+    my $self = shift;
+    my %args = @_;
+    my $db_file = "t/var/DBIxClass.db";
+
+    unlink($db_file) if -e $db_file;
+    unlink($db_file . "-journal") if -e $db_file . "-journal";
+    mkdir("t/var") unless -d "t/var";
+
+    my $dsn = $ENV{"DBICTEST_DSN"} || "dbi:SQLite:${db_file}";
+    my $dbuser = $ENV{"DBICTEST_DBUSER"} || '';
+    my $dbpass = $ENV{"DBICTEST_DBPASS"} || '';
+
+    my $schema = DBICTest::Schema->compose_connection('DBICTest' => $dsn, $dbuser, $dbpass);
+    if ( !$args{no_deploy} ) {
+        __PACKAGE__->deploy_schema( $schema );
+        __PACKAGE__->populate_schema( $schema ) if( !$args{no_populate} );
+    }
+    return $schema;
+}
+
+=head2 deploy_schema
+
+  DBICTest->deploy_schema( $schema );
+
+This method does one of two things to the schema.  It can either call 
+the experimental $schema->deploy() if the DBICTEST_SQLT_DEPLOY environment 
+variable is set, otherwise the default is to read in the t/lib/sqlite.sql 
+file and execute the SQL within. Either way you end up with a fresh set 
+of tables for testing.
+
+=cut
+
+sub deploy_schema {
+    my $self = shift;
+    my $schema = shift;
+
+    if ($ENV{"DBICTEST_SQLT_DEPLOY"}) {
+        return $schema->deploy();
+    } else {
+        open IN, "t/lib/sqlite.sql";
+        my $sql;
+        { local $/ = undef; $sql = <IN>; }
+        close IN;
+        $schema->storage->dbh->do($_) for split(/;\n/, $sql);
+    }
+}
+
+=head2 populate_schema
+
+  DBICTest->populate_schema( $schema );
+
+After you deploy your schema you can use this method to populate 
+the tables with test data.
+
+=cut
+
+sub populate_schema {
+    my $self = shift;
+    my $schema = shift;
+
+    $schema->storage->dbh->do("PRAGMA synchronous = OFF");
+
+    $schema->populate('Artist', [
+        [ qw/artistid name/ ],
+        [ 1, 'Caterwauler McCrae' ],
+        [ 2, 'Random Boy Band' ],
+        [ 3, 'We Are Goth' ],
+    ]);
+
+    $schema->populate('CD', [
+        [ qw/cdid artist title year/ ],
+        [ 1, 1, "Spoonful of bees", 1999 ],
+        [ 2, 1, "Forkful of bees", 2001 ],
+        [ 3, 1, "Caterwaulin' Blues", 1997 ],
+        [ 4, 2, "Generic Manufactured Singles", 2001 ],
+        [ 5, 3, "Come Be Depressed With Us", 1998 ],
+    ]);
+
+    $schema->populate('LinerNotes', [
+        [ qw/liner_id notes/ ],
+        [ 2, "Buy Whiskey!" ],
+        [ 4, "Buy Merch!" ],
+        [ 5, "Kill Yourself!" ],
+    ]);
+
+    $schema->populate('Tag', [
+        [ qw/tagid cd tag/ ],
+        [ 1, 1, "Blue" ],
+        [ 2, 2, "Blue" ],
+        [ 3, 3, "Blue" ],
+        [ 4, 5, "Blue" ],
+        [ 5, 2, "Cheesy" ],
+        [ 6, 4, "Cheesy" ],
+        [ 7, 5, "Cheesy" ],
+        [ 8, 2, "Shiny" ],
+        [ 9, 4, "Shiny" ],
+    ]);
+
+    $schema->populate('TwoKeys', [
+        [ qw/artist cd/ ],
+        [ 1, 1 ],
+        [ 1, 2 ],
+        [ 2, 2 ],
+    ]);
+
+    $schema->populate('FourKeys', [
+        [ qw/foo bar hello goodbye/ ],
+        [ 1, 2, 3, 4 ],
+        [ 5, 4, 3, 6 ],
+    ]);
+
+    $schema->populate('OneKey', [
+        [ qw/id artist cd/ ],
+        [ 1, 1, 1 ],
+        [ 2, 1, 2 ],
+        [ 3, 2, 2 ],
+    ]);
+
+    $schema->populate('SelfRef', [
+        [ qw/id name/ ],
+        [ 1, 'First' ],
+        [ 2, 'Second' ],
+    ]);
+
+    $schema->populate('SelfRefAlias', [
+        [ qw/self_ref alias/ ],
+        [ 1, 2 ]
+    ]);
+
+    $schema->populate('ArtistUndirectedMap', [
+        [ qw/id1 id2/ ],
+        [ 1, 2 ]
+    ]);
+
+    $schema->populate('Producer', [
+        [ qw/producerid name/ ],
+        [ 1, 'Matt S Trout' ],
+        [ 2, 'Bob The Builder' ],
+        [ 3, 'Fred The Phenotype' ],
+    ]);
+
+    $schema->populate('CD_to_Producer', [
+        [ qw/cd producer/ ],
+        [ 1, 1 ],
+        [ 1, 2 ],
+        [ 1, 3 ],
+    ]);
+
+    $schema->populate('TreeLike', [
+        [ qw/id parent name/ ],
+        [ 1, 0, 'foo'  ],
+        [ 2, 1, 'bar'  ],
+        [ 3, 2, 'baz'  ],
+        [ 4, 3, 'quux' ],
+    ]);
+
+    $schema->populate('Track', [
+        [ qw/trackid cd  position title/ ],
+        [ 4, 2, 1, "Stung with Success"],
+        [ 5, 2, 2, "Stripy"],
+        [ 6, 2, 3, "Sticky Honey"],
+        [ 7, 3, 1, "Yowlin"],
+        [ 8, 3, 2, "Howlin"],
+        [ 9, 3, 3, "Fowlin"],
+        [ 10, 4, 1, "Boring Name"],
+        [ 11, 4, 2, "Boring Song"],
+        [ 12, 4, 3, "No More Ideas"],
+        [ 13, 5, 1, "Sad"],
+        [ 14, 5, 2, "Under The Weather"],
+        [ 15, 5, 3, "Suicidal"],
+        [ 16, 1, 1, "The Bees Knees"],
+        [ 17, 1, 2, "Apiary"],
+        [ 18, 1, 3, "Beehind You"],
+    ]);
 
-  unlink($db_file) if -e $db_file;
-  unlink($db_file . "-journal") if -e $db_file . "-journal";
-  mkdir("t/var") unless -d "t/var";
+    $schema->populate('Event', [
+        [ qw/id starts_at/ ],
+        [ 1, '2006-04-25 22:24:33' ],
+    ]);
 
-  my $dsn = $ENV{"DBICTEST_DSN"} || "dbi:SQLite:${db_file}";
-  my $dbuser = $ENV{"DBICTEST_DBUSER"} || '';
-  my $dbpass = $ENV{"DBICTEST_DBPASS"} || '';
+    $schema->populate('Link', [
+        [ qw/id title/ ],
+        [ 1, 'aaa' ]
+    ]);
 
-  my $schema = DBICTest::Schema->compose_connection('DBICTest' => $dsn, $dbuser, $dbpass);
-  $schema->deploy();
-  $schema->auto_populate();
-  return $schema;
+    $schema->populate('Bookmark', [
+        [ qw/id link/ ],
+        [ 1, 1 ]
+    ]);
 }
 
 1;
index aff1d00..1fd503c 100644 (file)
@@ -35,147 +35,4 @@ __PACKAGE__->load_classes(qw/
   qw/SelfRefAlias TreeLike TwoKeyTreeLike Event/
 );
 
-sub deploy {
-    my $self = shift;
-
-    if ($ENV{"DBICTEST_SQLT_DEPLOY"}) {
-        return $schema->next::method(@_);
-    } else {
-        open IN, "t/lib/sqlite.sql";
-        my $sql;
-        { local $/ = undef; $sql = <IN>; }
-        close IN;
-        $self->storage->dbh->do($_) for split(/;\n/, $sql);
-    }
-}
-
-sub auto_populate {
-    my $self = shift;
-
-    $self->storage->dbh->do("PRAGMA synchronous = OFF");
-
-    $self->populate('Artist', [
-        [ qw/artistid name/ ],
-        [ 1, 'Caterwauler McCrae' ],
-        [ 2, 'Random Boy Band' ],
-        [ 3, 'We Are Goth' ],
-    ]);
-
-    $self->populate('CD', [
-        [ qw/cdid artist title year/ ],
-        [ 1, 1, "Spoonful of bees", 1999 ],
-        [ 2, 1, "Forkful of bees", 2001 ],
-        [ 3, 1, "Caterwaulin' Blues", 1997 ],
-        [ 4, 2, "Generic Manufactured Singles", 2001 ],
-        [ 5, 3, "Come Be Depressed With Us", 1998 ],
-    ]);
-
-    $self->populate('LinerNotes', [
-        [ qw/liner_id notes/ ],
-        [ 2, "Buy Whiskey!" ],
-        [ 4, "Buy Merch!" ],
-        [ 5, "Kill Yourself!" ],
-    ]);
-
-    $self->populate('Tag', [
-        [ qw/tagid cd tag/ ],
-        [ 1, 1, "Blue" ],
-        [ 2, 2, "Blue" ],
-        [ 3, 3, "Blue" ],
-        [ 4, 5, "Blue" ],
-        [ 5, 2, "Cheesy" ],
-        [ 6, 4, "Cheesy" ],
-        [ 7, 5, "Cheesy" ],
-        [ 8, 2, "Shiny" ],
-        [ 9, 4, "Shiny" ],
-    ]);
-
-    $self->populate('TwoKeys', [
-        [ qw/artist cd/ ],
-        [ 1, 1 ],
-        [ 1, 2 ],
-        [ 2, 2 ],
-    ]);
-
-    $self->populate('FourKeys', [
-        [ qw/foo bar hello goodbye/ ],
-        [ 1, 2, 3, 4 ],
-        [ 5, 4, 3, 6 ],
-    ]);
-
-    $self->populate('OneKey', [
-        [ qw/id artist cd/ ],
-        [ 1, 1, 1 ],
-        [ 2, 1, 2 ],
-        [ 3, 2, 2 ],
-    ]);
-
-    $self->populate('SelfRef', [
-        [ qw/id name/ ],
-        [ 1, 'First' ],
-        [ 2, 'Second' ],
-    ]);
-
-    $self->populate('SelfRefAlias', [
-        [ qw/self_ref alias/ ],
-        [ 1, 2 ]
-    ]);
-
-    $self->populate('ArtistUndirectedMap', [
-        [ qw/id1 id2/ ],
-        [ 1, 2 ]
-    ]);
-
-    $self->populate('Producer', [
-        [ qw/producerid name/ ],
-        [ 1, 'Matt S Trout' ],
-        [ 2, 'Bob The Builder' ],
-        [ 3, 'Fred The Phenotype' ],
-    ]);
-
-    $self->populate('CD_to_Producer', [
-        [ qw/cd producer/ ],
-        [ 1, 1 ],
-        [ 1, 2 ],
-        [ 1, 3 ],
-    ]);
-
-    $self->populate('TreeLike', [
-        [ qw/id parent name/ ],
-        [ 1, 0, 'foo'  ],
-        [ 2, 1, 'bar'  ],
-        [ 3, 2, 'baz'  ],
-        [ 4, 3, 'quux' ],
-    ]);
-
-    $self->populate('Track', [
-        [ qw/trackid cd  position title/ ],
-        [ 4, 2, 1, "Stung with Success"],
-        [ 5, 2, 2, "Stripy"],
-        [ 6, 2, 3, "Sticky Honey"],
-        [ 7, 3, 1, "Yowlin"],
-        [ 8, 3, 2, "Howlin"],
-        [ 9, 3, 3, "Fowlin"],
-        [ 10, 4, 1, "Boring Name"],
-        [ 11, 4, 2, "Boring Song"],
-        [ 12, 4, 3, "No More Ideas"],
-        [ 13, 5, 1, "Sad"],
-        [ 14, 5, 2, "Under The Weather"],
-        [ 15, 5, 3, "Suicidal"],
-        [ 16, 1, 1, "The Bees Knees"],
-        [ 17, 1, 2, "Apiary"],
-        [ 18, 1, 3, "Beehind You"],
-    ]);
-
-    $self->populate('Link', [
-        [ qw/id title/ ],
-        [ 1, 'aaa' ]
-    ]);
-
-    $self->populate('Bookmark', [
-        [ qw/id link/ ],
-        [ 1, 1 ]
-    ]);
-}
-
 1;
index f4c6706..0bb49c4 100644 (file)
@@ -3,10 +3,8 @@ package # hide from PAUSE
 
 use base 'DBIx::Class::Core';
 
-__PACKAGE__->load_components('PK::Auto');
-
-DBICTest::Schema::Artist->table('artist');
-DBICTest::Schema::Artist->add_columns(
+__PACKAGE__->table('artist');
+__PACKAGE__->add_columns(
   'artistid' => {
     data_type => 'integer',
     is_auto_increment => 1
@@ -17,11 +15,25 @@ DBICTest::Schema::Artist->add_columns(
     is_nullable => 1,
   },
 );
-DBICTest::Schema::Artist->set_primary_key('artistid');
+__PACKAGE__->set_primary_key('artistid');
 
 __PACKAGE__->mk_classdata('field_name_for', {
     artistid    => 'primary key',
     name        => 'artist name',
 });
 
+__PACKAGE__->has_many(
+    cds => 'DBICTest::Schema::CD', undef,
+    { order_by => 'year' },
+);
+
+__PACKAGE__->has_many( twokeys => 'DBICTest::Schema::TwoKeys' );
+__PACKAGE__->has_many( onekeys => 'DBICTest::Schema::OneKey' );
+
+__PACKAGE__->has_many(
+  artist_undirected_maps => 'DBICTest::Schema::ArtistUndirectedMap',
+  [ {'foreign.id1' => 'self.artistid'}, {'foreign.id2' => 'self.artistid'} ],
+  { cascade_copy => 0 } # this would *so* not make sense
+);
+
 1;
index 6e888ed..2669575 100644 (file)
@@ -10,4 +10,11 @@ __PACKAGE__->add_columns(
 );
 __PACKAGE__->set_primary_key(qw/id1 id2/);
 
+__PACKAGE__->belongs_to( 'artist1', 'DBICTest::Schema::Artist', 'id1' );
+__PACKAGE__->belongs_to( 'artist2', 'DBICTest::Schema::Artist', 'id2');
+__PACKAGE__->has_many(
+  'mapped_artists', 'DBICTest::Schema::Artist',
+  [ {'foreign.artistid' => 'self.id1'}, {'foreign.artistid' => 'self.id2'} ],
+);
+
 1;
index 4f9ec44..72db586 100644 (file)
@@ -7,7 +7,6 @@ package # hide from PAUSE
 use strict;
 use warnings;
 
-__PACKAGE__->load_components(qw/PK::Auto Core/);
 __PACKAGE__->table('bookmark');
 __PACKAGE__->add_columns(qw/id link/);
 __PACKAGE__->add_columns(
index 90e4c0c..262d23f 100644 (file)
@@ -3,10 +3,8 @@ package # hide from PAUSE
 
 use base 'DBIx::Class::Core';
 
-__PACKAGE__->load_components('PK::Auto');
-
-DBICTest::Schema::CD->table('cd');
-DBICTest::Schema::CD->add_columns(
+__PACKAGE__->table('cd');
+__PACKAGE__->add_columns(
   'cdid' => {
     data_type => 'integer',
     is_auto_increment => 1,
@@ -23,7 +21,28 @@ DBICTest::Schema::CD->add_columns(
     size      => 100,
   },
 );
-DBICTest::Schema::CD->set_primary_key('cdid');
-DBICTest::Schema::CD->add_unique_constraint(artist_title => [ qw/artist title/ ]);
+__PACKAGE__->set_primary_key('cdid');
+__PACKAGE__->add_unique_constraint(artist_title => [ qw/artist title/ ]);
+
+__PACKAGE__->belongs_to( artist => 'DBICTest::Schema::Artist' );
+
+__PACKAGE__->has_many( tracks => 'DBICTest::Schema::Track' );
+__PACKAGE__->has_many(
+    tags => 'DBICTest::Schema::Tag', undef,
+    { order_by => 'tag' },
+);
+__PACKAGE__->has_many(
+    cd_to_producer => 'DBICTest::Schema::CD_to_Producer' => 'cd'
+);
+
+__PACKAGE__->might_have(
+    liner_notes => 'DBICTest::Schema::LinerNotes', undef,
+    { proxy => [ qw/notes/ ] },
+);
+__PACKAGE__->many_to_many( producers => cd_to_producer => 'producer' );
+__PACKAGE__->many_to_many(
+    producers_sorted => cd_to_producer => 'producer',
+    { order_by => 'producer.name' },
+);
 
 1;
index 378c58c..117a590 100644 (file)
@@ -10,4 +10,14 @@ __PACKAGE__->add_columns(
 );
 __PACKAGE__->set_primary_key(qw/cd producer/);
 
+__PACKAGE__->belongs_to(
+  'cd', 'DBICTest::Schema::CD',
+  { 'foreign.cdid' => 'self.cd' }
+);
+
+__PACKAGE__->belongs_to(
+  'producer', 'DBICTest::Schema::Producer',
+  { 'foreign.producerid' => 'self.producer' }
+);
+
 1;
index e91f872..78b3d16 100644 (file)
@@ -1,9 +1,9 @@
 package # hide from PAUSE 
     DBICTest::Schema::Employee;
 
-use base 'DBIx::Class';
+use base 'DBIx::Class::Core';
 
-__PACKAGE__->load_components(qw( Ordered PK::Auto Core ));
+__PACKAGE__->load_components(qw( Ordered ));
 
 __PACKAGE__->table('employee');
 
index fea3b07..937d782 100644 (file)
@@ -2,9 +2,9 @@ package DBICTest::Schema::Event;
 
 use strict;
 use warnings;
-use base qw/DBIx::Class/;
+use base qw/DBIx::Class::Core/;
 
-__PACKAGE__->load_components(qw/InflateColumn::DateTime PK::Auto Core/);
+__PACKAGE__->load_components(qw/InflateColumn::DateTime/);
 
 __PACKAGE__->table('event');
 
index 72574ea..5343122 100644 (file)
@@ -6,7 +6,6 @@ use base 'DBIx::Class::Core';
 use strict;
 use warnings;
 
-__PACKAGE__->load_components(qw/PK::Auto Core/);
 __PACKAGE__->table('link');
 __PACKAGE__->add_columns(
     'id' => {
index dbe7003..4cc2918 100644 (file)
@@ -3,8 +3,6 @@ package # hide from PAUSE
 
 use base 'DBIx::Class::Core';
 
-__PACKAGE__->load_components('PK::Auto');
-
 DBICTest::Schema::OneKey->table('onekey');
 DBICTest::Schema::OneKey->add_columns(
   'id' => {
diff --git a/t/lib/DBICTest/Schema/Relationships.pm b/t/lib/DBICTest/Schema/Relationships.pm
deleted file mode 100644 (file)
index a199c88..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-package # hide from PAUSE 
-    DBICTest::Schema::Relationships;
-
-use base 'DBIx::Class::Core';
-
-DBICTest::Schema::Artist->has_many(cds => 'DBICTest::Schema::CD', undef,
-                                     { order_by => 'year' });
-DBICTest::Schema::Artist->has_many(twokeys => 'DBICTest::Schema::TwoKeys');
-DBICTest::Schema::Artist->has_many(onekeys => 'DBICTest::Schema::OneKey');
-
-DBICTest::Schema::CD->belongs_to('artist', 'DBICTest::Schema::Artist');
-
-DBICTest::Schema::CD->has_many(tracks => 'DBICTest::Schema::Track');
-DBICTest::Schema::CD->has_many(tags => 'DBICTest::Schema::Tag', undef,
-                                 { order_by => 'tag' });
-DBICTest::Schema::CD->has_many(cd_to_producer => 'DBICTest::Schema::CD_to_Producer' => 'cd');
-
-DBICTest::Schema::CD->might_have(liner_notes => 'DBICTest::Schema::LinerNotes',
-                                  undef, { proxy => [ qw/notes/ ] });
-
-DBICTest::Schema::SelfRefAlias->belongs_to(
-  self_ref => 'DBICTest::Schema::SelfRef');
-DBICTest::Schema::SelfRefAlias->belongs_to(
-  alias => 'DBICTest::Schema::SelfRef');
-
-DBICTest::Schema::SelfRef->has_many(
-  aliases => 'DBICTest::Schema::SelfRefAlias' => 'self_ref');
-
-DBICTest::Schema::Tag->belongs_to('cd', 'DBICTest::Schema::CD');
-
-DBICTest::Schema::Track->belongs_to('cd', 'DBICTest::Schema::CD');
-DBICTest::Schema::Track->belongs_to('disc', 'DBICTest::Schema::CD', 'cd');
-
-DBICTest::Schema::TwoKeys->belongs_to('artist', 'DBICTest::Schema::Artist');
-DBICTest::Schema::TwoKeys->belongs_to('cd', 'DBICTest::Schema::CD');
-
-DBICTest::Schema::CD_to_Producer->belongs_to(
-  'cd', 'DBICTest::Schema::CD',
-  { 'foreign.cdid' => 'self.cd' }
-);
-DBICTest::Schema::CD_to_Producer->belongs_to(
-  'producer', 'DBICTest::Schema::Producer',
-  { 'foreign.producerid' => 'self.producer' }
-);
-DBICTest::Schema::Artist->has_many(
-  'artist_undirected_maps', 'DBICTest::Schema::ArtistUndirectedMap',
-  [{'foreign.id1' => 'self.artistid'}, {'foreign.id2' => 'self.artistid'}],
-  { cascade_copy => 0 } # this would *so* not make sense
-);
-DBICTest::Schema::ArtistUndirectedMap->belongs_to(
-  'artist1', 'DBICTest::Schema::Artist', 'id1');
-DBICTest::Schema::ArtistUndirectedMap->belongs_to(
-  'artist2', 'DBICTest::Schema::Artist', 'id2');
-DBICTest::Schema::ArtistUndirectedMap->has_many(
-  'mapped_artists', 'DBICTest::Schema::Artist',
-  [{'foreign.artistid' => 'self.id1'}, {'foreign.artistid' => 'self.id2'}]);
-
-# now the Helpers
-DBICTest::Schema::CD->many_to_many( 'producers', 'cd_to_producer', 'producer');
-DBICTest::Schema::CD->many_to_many( 'producers_sorted', 'cd_to_producer', 'producer', { order_by => 'producer.name' });
-
-1;
index 474c1a2..ec715c7 100644 (file)
@@ -16,4 +16,6 @@ __PACKAGE__->add_columns(
 );\r
 __PACKAGE__->set_primary_key('id');\r
 \r
+__PACKAGE__->has_many( aliases => 'DBICTest::Schema::SelfRefAlias' => 'self_ref' );\r
+\r
 1;\r
index 9d58a8c..e7ed491 100644 (file)
@@ -14,4 +14,7 @@ __PACKAGE__->add_columns(
 );\r
 __PACKAGE__->set_primary_key(qw/self_ref alias/);\r
 \r
+__PACKAGE__->belongs_to( self_ref => 'DBICTest::Schema::SelfRef' );\r
+__PACKAGE__->belongs_to( alias => 'DBICTest::Schema::SelfRef' );\r
+\r
 1;\r
index b93b622..b75c2ef 100644 (file)
@@ -3,10 +3,8 @@ package # hide from PAUSE
 
 use base qw/DBIx::Class::Core/;
 
-__PACKAGE__->load_components('PK::Auto');
-
-DBICTest::Schema::Tag->table('tags');
-DBICTest::Schema::Tag->add_columns(
+__PACKAGE__->table('tags');
+__PACKAGE__->add_columns(
   'tagid' => {
     data_type => 'integer',
     is_auto_increment => 1,
@@ -19,6 +17,8 @@ DBICTest::Schema::Tag->add_columns(
     size      => 100,
   },
 );
-DBICTest::Schema::Tag->set_primary_key('tagid');
+__PACKAGE__->set_primary_key('tagid');
+
+__PACKAGE__->belongs_to( cd => 'DBICTest::Schema::CD' );
 
 1;
index 9bbefff..691974a 100644 (file)
@@ -3,8 +3,8 @@ package # hide from PAUSE
 
 use base 'DBIx::Class::Core';
 
-DBICTest::Schema::Track->table('track');
-DBICTest::Schema::Track->add_columns(
+__PACKAGE__->table('track');
+__PACKAGE__->add_columns(
   'trackid' => {
     data_type => 'integer',
     is_auto_increment => 1,
@@ -21,6 +21,9 @@ DBICTest::Schema::Track->add_columns(
     size      => 100,
   },
 );
-DBICTest::Schema::Track->set_primary_key('trackid');
+__PACKAGE__->set_primary_key('trackid');
+
+__PACKAGE__->belongs_to( cd => 'DBICTest::Schema::CD' );
+__PACKAGE__->belongs_to( disc => 'DBICTest::Schema::CD' => 'cd');
 
 1;
index 1eca3e1..73f9143 100644 (file)
@@ -1,9 +1,7 @@
 package # hide from PAUSE 
     DBICTest::Schema::TreeLike;
 
-use base qw/DBIx::Class/;
-
-__PACKAGE__->load_components(qw/PK::Auto::SQLite Core/);
+use base qw/DBIx::Class::Core/;
 
 __PACKAGE__->table('treelike');
 __PACKAGE__->add_columns(
index c7258e0..1c1b7b9 100644 (file)
@@ -1,9 +1,7 @@
 package # hide from PAUSE 
     DBICTest::Schema::TwoKeyTreeLike;
 
-use base qw/DBIx::Class/;
-
-__PACKAGE__->load_components(qw/Core/);
+use base qw/DBIx::Class::Core/;
 
 __PACKAGE__->table('twokeytreelike');
 __PACKAGE__->add_columns(
index 91a6fef..8483d0b 100755 (executable)
@@ -3,11 +3,14 @@ package # hide from PAUSE
 
 use base 'DBIx::Class::Core';
 
-DBICTest::Schema::TwoKeys->table('twokeys');
-DBICTest::Schema::TwoKeys->add_columns(
+__PACKAGE__->table('twokeys');
+__PACKAGE__->add_columns(
   'artist' => { data_type => 'integer' },
   'cd' => { data_type => 'integer' },
 );
-DBICTest::Schema::TwoKeys->set_primary_key(qw/artist cd/);
+__PACKAGE__->set_primary_key(qw/artist cd/);
+
+__PACKAGE__->belongs_to( artist => 'DBICTest::Schema::Artist' );
+__PACKAGE__->belongs_to( cd => 'DBICTest::Schema::CD' );
 
 1;