Schema support added, DBICTest refactored to use it

[dbsrgits/DBIx-Class.git] / t / lib / DBICTest.pm

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index a7ba0cb..2ecb7ce 100755 (executable)
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -1,8 +1,7 @@
-package DBICTest;
-
 use strict;
 use warnings;
-use base qw/DBIx::Class::Core/;
+use DBICTest::Schema;
+use DateTime;
 
 my $db_file = "t/var/DBIxClass.db";
 
@@ -10,9 +9,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->storage->dbh;
 
 my $sql = <<EOSQL;
 CREATE TABLE artist (artistid INTEGER NOT NULL PRIMARY KEY, name VARCHAR);
@@ -105,81 +104,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->has_a(cd => 'SweetTest::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->has_a(cd => 'SweetTest::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('trackid');
-
-#DBICTest::CD->has_many(tracks => 'SweetTest::Track');
-#DBICTest::CD->has_many(tags => 'SweetTest::Tag');
-#DBICTest::CD->has_a(artist => 'SweetTest::Artist');
-
-#DBICTest::CD->might_have(liner_notes => 'SweetTest::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->has_many(cds => 'SweetTest::CD');
-#DBICTest::Artist->has_many(twokeys => 'SweetTest::TwoKeys');
-#DBICTest::Artist->has_many(onekeys => 'SweetTest::OneKey');
-
-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->has_a(artist => 'SweetTest::Artist');
-#DBICTest::TwoKeys->has_a(cd => 'SweetTest::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/);
-
-package DBICTest::OneKey;
-
-use base 'DBICTest';
-
-DBICTest::OneKey->table('onekey');
-DBICTest::OneKey->add_columns(qw/id artist cd/);
-DBICTest::OneKey->set_primary_key('id');
-
 1;