X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FDBICTest.pm;h=628696a6c5598a351818129418ec1ada19a96268;hb=7daf649db5e644ea6d26a12f2caba1582bed6224;hp=ecd492155fc7708faadc4353866c7d1596ed6c8f;hpb=60786fdc3570fbb313e65a6518c1d7f2f2d0795c;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index ecd4921..628696a 100755
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -1,219 +1,21 @@
-package DBICTest;
+package # hide from PAUSE 
+    DBICTest;
 
 use strict;
 use warnings;
-use base qw/DBIx::Class::Core/;
-use DateTime;
-
-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";
-
-__PACKAGE__->connection("dbi:SQLite:${db_file}");
-
-my $dbh = __PACKAGE__->_get_dbh;
-
-my $sql = <<EOSQL;
-CREATE TABLE artist (artistid INTEGER NOT NULL PRIMARY KEY, name VARCHAR);
-
-CREATE TABLE cd (cdid INTEGER NOT NULL PRIMARY KEY, artist INTEGER NOT NULL,
-                     title VARCHAR, year VARCHAR);
-
-CREATE TABLE liner_notes (liner_id INTEGER NOT NULL PRIMARY KEY, notes VARCHAR);
-
-CREATE TABLE track (trackid INTEGER NOT NULL PRIMARY KEY, cd INTEGER NOT NULL,
-                       position INTEGER NOT NULL, title VARCHAR);
-
-CREATE TABLE tags (tagid INTEGER NOT NULL PRIMARY KEY, cd INTEGER NOT NULL,
-                      tag VARCHAR);
-
-CREATE TABLE twokeys (artist INTEGER NOT NULL, cd INTEGER NOT NULL,
-                      PRIMARY KEY (artist, cd) );
-
-CREATE TABLE fourkeys (foo INTEGER NOT NULL, bar INTEGER NOT NULL,
-                      hello INTEGER NOT NULL, goodbye INTEGER NOT NULL,
-                      PRIMARY KEY (foo, bar, hello, goodbye) );
-
-CREATE TABLE onekey (id INTEGER NOT NULL PRIMARY KEY,
-                      artist INTEGER NOT NULL, cd INTEGER NOT NULL );
-
-INSERT INTO artist (artistid, name) VALUES (1, 'Caterwauler McCrae');
-
-INSERT INTO artist (artistid, name) VALUES (2, 'Random Boy Band');
-
-INSERT INTO artist (artistid, name) VALUES (3, 'We Are Goth');
-
-INSERT INTO cd (cdid, artist, title, year)
-    VALUES (1, 1, "Spoonful of bees", 1999);
-
-INSERT INTO cd (cdid, artist, title, year)
-    VALUES (2, 1, "Forkful of bees", 2001);
-
-INSERT INTO cd (cdid, artist, title, year)
-    VALUES (3, 1, "Caterwaulin' Blues", 1997);
-
-INSERT INTO cd (cdid, artist, title, year)
-    VALUES (4, 2, "Generic Manufactured Singles", 2001);
-
-INSERT INTO cd (cdid, artist, title, year)
-    VALUES (5, 3, "Come Be Depressed With Us", 1998);
-
-INSERT INTO liner_notes (liner_id, notes)
-    VALUES (2, "Buy Whiskey!");
-
-INSERT INTO liner_notes (liner_id, notes)
-    VALUES (4, "Buy Merch!");
-
-INSERT INTO liner_notes (liner_id, notes)
-    VALUES (5, "Kill Yourself!");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (1, 1, "Blue");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (2, 2, "Blue");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (3, 3, "Blue");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (4, 5, "Blue");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (5, 2, "Cheesy");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (6, 4, "Cheesy");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (7, 5, "Cheesy");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (8, 2, "Shiny");
-
-INSERT INTO tags (tagid, cd, tag) VALUES (9, 4, "Shiny");
-
-INSERT INTO twokeys (artist, cd) VALUES (1, 1);
-
-INSERT INTO twokeys (artist, cd) VALUES (1, 2);
-
-INSERT INTO twokeys (artist, cd) VALUES (2, 2);
-
-INSERT INTO fourkeys (foo, bar, hello, goodbye) VALUES (1, 2, 3, 4);
-
-INSERT INTO fourkeys (foo, bar, hello, goodbye) VALUES (5, 4, 3, 6);
-
-INSERT INTO onekey (id, artist, cd) VALUES (1, 1, 1);
-
-INSERT INTO onekey (id, artist, cd) VALUES (2, 1, 2);
-
-INSERT INTO onekey (id, artist, cd) VALUES (3, 2, 2);
-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/);
-DBICTest::CD->inflate_column( 'year',
-    { inflate => sub { DateTime->new( year => shift ) } },
-    { deflate => sub { shift->year } }
-);
-
-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/);
-
+use DBICTest::Schema;
+
+sub initialise {
+
+  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 = "dbi:SQLite:${db_file}";
+  
+  return DBICTest::Schema->compose_connection('DBICTest' => $dsn);
+}
+  
 1;