X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FDBICTest.pm;h=525703e7364bdfe1e9c4438ec8c4ed9907a1fad4;hb=2a21de92912f460837806a8f1d0a6f8b892609da;hp=75dc99ccb6566ca29d2c82c6ae189d64ce4c9ba1;hpb=0e5c2582d62172ef590478cc068172c667c1b064;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index 75dc99c..525703e 100755
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -1,9 +1,6 @@
-package DBICTest;
-
 use strict;
 use warnings;
-use base qw/DBIx::Class::Core/;
-use DateTime;
+use DBICTest::Schema;
 
 my $db_file = "t/var/DBIxClass.db";
 
@@ -11,9 +8,9 @@ unlink($db_file) if -e $db_file;
 unlink($db_file . "-journal") if -e $db_file . "-journal";
 mkdir("t/var") unless -d "t/var";
 
-__PACKAGE__->connection("dbi:SQLite:${db_file}");
+DBICTest::Schema->compose_connection('DBICTest' => "dbi:SQLite:${db_file}");
 
-my $dbh = __PACKAGE__->_get_dbh;
+my $dbh = DBICTest::_db->storage->dbh;
 
 my $sql = <<EOSQL;
 CREATE TABLE artist (artistid INTEGER NOT NULL PRIMARY KEY, name VARCHAR);
@@ -106,110 +103,4 @@ EOSQL
 
 $dbh->do($_) for split(/\n\n/, $sql);
 
-package DBICTest::LinerNotes;
-
-use base 'DBICTest';
-
-DBICTest::LinerNotes->table('liner_notes');
-DBICTest::LinerNotes->add_columns(qw/liner_id notes/);
-DBICTest::LinerNotes->set_primary_key('liner_id');
-
-package DBICTest::Tag;
-
-use base 'DBICTest';
-
-DBICTest::Tag->table('tags');
-DBICTest::Tag->add_columns(qw/tagid cd tag/);
-DBICTest::Tag->set_primary_key('tagid');
-DBICTest::Tag->add_relationship(
-    cd => 'DBICTest::CD',
-    { 'foreign.cdid' => 'self.cd' }
-);
-
-package DBICTest::Track;
-
-use base 'DBICTest';
-
-DBICTest::Track->table('track');
-DBICTest::Track->add_columns(qw/trackid cd position title/);
-DBICTest::Track->set_primary_key('trackid');
-DBICTest::Track->add_relationship(
-    cd => 'DBICTest::CD',
-    { 'foreign.cdid' => 'self.cd' }
-);
-
-package DBICTest::CD;
-
-use base 'DBICTest';
-
-DBICTest::CD->table('cd');
-DBICTest::CD->add_columns(qw/cdid artist title year/);
-DBICTest::CD->set_primary_key('cdid');
-DBICTest::CD->add_relationship(
-    artist => 'DBICTest::Artist',
-    { 'foreign.artistid' => 'self.artist' }
-);
-DBICTest::CD->add_relationship(
-    tracks => 'DBICTest::Track',
-    { 'foreign.cd' => 'self.cdid' }
-);
-DBICTest::CD->add_relationship(
-    tags => 'DBICTest::Tag',
-    { 'foreign.cd' => 'self.cdid' }
-);
-#DBICTest::CD->might_have(liner_notes => 'DBICTest::LinerNotes' => qw/notes/);
-
-package DBICTest::Artist;
-
-use base 'DBICTest';
-
-DBICTest::Artist->table('artist');
-DBICTest::Artist->add_columns(qw/artistid name/);
-DBICTest::Artist->set_primary_key('artistid');
-DBICTest::Artist->add_relationship(
-    cds => 'DBICTest::CD',
-    { 'foreign.artist' => 'self.artistid' },
-    { order_by => 'year' }
-);
-DBICTest::Artist->add_relationship(
-    twokeys => 'DBICTest::TwoKeys',
-    { 'foreign.artist' => 'self.artistid' }
-);
-DBICTest::Artist->add_relationship(
-    onekeys => 'DBICTest::OneKey',
-    { 'foreign.artist' => 'self.artistid' }
-);
-
-package DBICTest::OneKey;
-
-use base 'DBICTest';
-
-DBICTest::OneKey->table('onekey');
-DBICTest::OneKey->add_columns(qw/id artist cd/);
-DBICTest::OneKey->set_primary_key('id');
-
-package DBICTest::TwoKeys;
-
-use base 'DBICTest';
-
-DBICTest::TwoKeys->table('twokeys');
-DBICTest::TwoKeys->add_columns(qw/artist cd/);
-DBICTest::TwoKeys->set_primary_key(qw/artist cd/);
-DBICTest::TwoKeys->add_relationship(
-    artist => 'DBICTest::Artist',
-    { 'foreign.artistid' => 'self.artist' }
-);
-DBICTest::TwoKeys->add_relationship(
-    cd => 'DBICTest::CD',
-    { 'foreign.cdid' => 'self.cd' }
-);
-
-package DBICTest::FourKeys;
-
-use base 'DBICTest';
-
-DBICTest::FourKeys->table('fourkeys');
-DBICTest::FourKeys->add_columns(qw/foo bar hello goodbye/);
-DBICTest::FourKeys->set_primary_key(qw/foo bar hello goodbye/);
-
 1;