From: Aran Deltac Date: Thu, 18 May 2006 03:58:32 +0000 (+0000) Subject: Removed BasicRels and reorganized where the various init/setup code resides. X-Git-Tag: v0.07002~75^2~167^2~1 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4b8dcc58874223164d4a379a5db4a9cb737d7c7a;p=dbsrgits%2FDBIx-Class.git Removed BasicRels and reorganized where the various init/setup code resides. --- diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm index 5ffdf90..af058be 100755 --- a/t/lib/DBICTest.pm +++ b/t/lib/DBICTest.pm @@ -4,22 +4,25 @@ package # hide from PAUSE use strict; use warnings; use DBICTest::Schema; +use DBICTest::Schema::Relationships; -sub initialise { +sub init_schema { 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 $dsn = "dbi:SQLite:${db_file}"; - - return DBICTest::Schema->compose_connection('DBICTest' => $dsn, $dbuser, $dbpass); + my $schema = DBICTest::Schema->compose_connection('DBICTest' => $dsn, $dbuser, $dbpass); + $schema->deploy(); + $schema->auto_populate(); + return $schema; + } - + 1; diff --git a/t/lib/DBICTest/BasicRels.pm b/t/lib/DBICTest/BasicRels.pm deleted file mode 100644 index 0e905df..0000000 --- a/t/lib/DBICTest/BasicRels.pm +++ /dev/null @@ -1,8 +0,0 @@ -package # hide from PAUSE - DBICTest::BasicRels; - -use DBICTest::Schema; -use DBICTest::Schema::BasicRels; -use DBICTest::Setup; - -1; diff --git a/t/lib/DBICTest/HelperRels.pm b/t/lib/DBICTest/HelperRels.pm deleted file mode 100644 index 93456ed..0000000 --- a/t/lib/DBICTest/HelperRels.pm +++ /dev/null @@ -1,8 +0,0 @@ -package # hide from PAUSE - DBICTest::HelperRels; - -use DBICTest::Schema; -use DBICTest::Schema::HelperRels; -use DBICTest::Setup; - -1; diff --git a/t/lib/DBICTest/Schema.pm b/t/lib/DBICTest/Schema.pm index d69abc0..8de3ba9 100644 --- a/t/lib/DBICTest/Schema.pm +++ b/t/lib/DBICTest/Schema.pm @@ -34,4 +34,147 @@ __PACKAGE__->load_classes(qw/ qw/SelfRefAlias TreeLike TwoKeyTreeLike/ ); +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 = ; } + 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; diff --git a/t/lib/DBICTest/Schema/BasicRels.pm b/t/lib/DBICTest/Schema/BasicRels.pm deleted file mode 100644 index 161e814..0000000 --- a/t/lib/DBICTest/Schema/BasicRels.pm +++ /dev/null @@ -1,107 +0,0 @@ -package # hide from PAUSE - DBICTest::Schema::BasicRels; - -use base 'DBIx::Class::Core'; - -DBICTest::Schema::Artist->add_relationship( - cds => 'DBICTest::Schema::CD', - { 'foreign.artist' => 'self.artistid' }, - { order_by => 'year', join_type => 'LEFT', cascade_delete => 1, cascade_copy => 1, accessor => 'multi' } -); -DBICTest::Schema::Artist->add_relationship( - twokeys => 'DBICTest::Schema::TwoKeys', - { 'foreign.artist' => 'self.artistid' }, - { cascade_copy => 1 } -); -DBICTest::Schema::Artist->add_relationship( - onekeys => 'DBICTest::Schema::OneKey', - { 'foreign.artist' => 'self.artistid' } -); -DBICTest::Schema::Artist->add_relationship( - artist_undirected_maps => 'DBICTest::Schema::ArtistUndirectedMap', - [{'foreign.id1' => 'self.artistid'}, {'foreign.id2' => 'self.artistid'}], - { accessor => 'multi' } -); -DBICTest::Schema::ArtistUndirectedMap->add_relationship( - 'mapped_artists', 'DBICTest::Schema::Artist', - [{'foreign.artistid' => 'self.id1'}, {'foreign.artistid' => 'self.id2'}] -); -DBICTest::Schema::CD->add_relationship( - artist => 'DBICTest::Schema::Artist', - { 'foreign.artistid' => 'self.artist' }, - { accessor => 'filter' }, -); -DBICTest::Schema::CD->add_relationship( - tracks => 'DBICTest::Schema::Track', - { 'foreign.cd' => 'self.cdid' }, - { join_type => 'LEFT', cascade_delete => 1 } -); -DBICTest::Schema::CD->add_relationship( - tags => 'DBICTest::Schema::Tag', - { 'foreign.cd' => 'self.cdid' }, - { join_type => 'LEFT', cascade_delete => 1, cascade_copy => 1, accessor => 'multi', order_by => 'tag' } -); -#DBICTest::Schema::CD->might_have(liner_notes => 'DBICTest::Schema::LinerNotes' => qw/notes/); -DBICTest::Schema::CD->add_relationship( - liner_notes => 'DBICTest::Schema::LinerNotes', - { 'foreign.liner_id' => 'self.cdid' }, - { join_type => 'LEFT', accessor => 'single' } -); -DBICTest::Schema::CD->add_relationship( - cd_to_producer => 'DBICTest::Schema::CD_to_Producer', - { 'foreign.cd' => 'self.cdid' }, - { join_type => 'LEFT', cascade_delete => 1 } -); - -DBICTest::Schema::SelfRefAlias->add_relationship( - self_ref => 'DBICTest::Schema::SelfRef', - { 'foreign.id' => 'self.self_ref' }, - { accessor => 'single' } - -); -DBICTest::Schema::SelfRefAlias->add_relationship( - alias => 'DBICTest::Schema::SelfRef', - { 'foreign.id' => 'self.alias' }, - { accessor => 'single' } -); - -DBICTest::Schema::SelfRef->add_relationship( - aliases => 'DBICTest::Schema::SelfRefAlias', - { 'foreign.self_ref' => 'self.id' }, - { accessor => 'multi' } -); - -DBICTest::Schema::Tag->add_relationship( - cd => 'DBICTest::Schema::CD', - { 'foreign.cdid' => 'self.cd' }, - { accessor => 'single' } -); - -DBICTest::Schema::Track->add_relationship( - cd => 'DBICTest::Schema::CD', - { 'foreign.cdid' => 'self.cd' } -); - -DBICTest::Schema::TwoKeys->add_relationship( - artist => 'DBICTest::Schema::Artist', - { 'foreign.artistid' => 'self.artist' } -); -DBICTest::Schema::TwoKeys->add_relationship( - cd => 'DBICTest::Schema::CD', - { 'foreign.cdid' => 'self.cd' } -); - -DBICTest::Schema::CD_to_Producer->add_relationship( - cd => 'DBICTest::Schema::CD', - { 'foreign.cdid' => 'self.cd' } -); -DBICTest::Schema::CD_to_Producer->add_relationship( - producer => 'DBICTest::Schema::Producer', - { 'foreign.producerid' => 'self.producer' } -); - -# 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; diff --git a/t/lib/DBICTest/Schema/HelperRels.pm b/t/lib/DBICTest/Schema/Relationships.pm similarity index 98% rename from t/lib/DBICTest/Schema/HelperRels.pm rename to t/lib/DBICTest/Schema/Relationships.pm index 45e0ed8..a199c88 100644 --- a/t/lib/DBICTest/Schema/HelperRels.pm +++ b/t/lib/DBICTest/Schema/Relationships.pm @@ -1,5 +1,5 @@ package # hide from PAUSE - DBICTest::Schema::HelperRels; + DBICTest::Schema::Relationships; use base 'DBIx::Class::Core'; diff --git a/t/run/06relationship.tl b/t/run/06relationship.tl index a66211e..78b857f 100644 --- a/t/run/06relationship.tl +++ b/t/run/06relationship.tl @@ -1,5 +1,8 @@ -sub run_tests { -my $schema = shift; +use Test::More; +use lib qw(t/lib); +use DBICTest; + +my $schema = DBICTest::init_schema(); use strict; use warnings; @@ -170,6 +173,3 @@ $artist->cds->update({artist => $nartist->id}); cmp_ok($artist->cds->count, '==', 0, "Correct new #cds for artist"); cmp_ok($nartist->cds->count, '==', 2, "Correct new #cds for artist"); -} - -1;