- fix ResultSet bug when requesting a subset of columns

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

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index a7ba0cb..09a05b6 100755 (executable)
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -1,8 +1,6 @@
-package DBICTest;
-
 use strict;
 use warnings;
-use base qw/DBIx::Class::Core/;
+use DBICTest::Schema;
 
 my $db_file = "t/var/DBIxClass.db";
 
@@ -10,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);
@@ -38,6 +36,12 @@ CREATE TABLE fourkeys (foo INTEGER NOT NULL, bar INTEGER NOT NULL,
 CREATE TABLE onekey (id INTEGER NOT NULL PRIMARY KEY,
                       artist INTEGER NOT NULL, cd INTEGER NOT NULL );
 
+CREATE TABLE self_ref (id INTEGER NOT NULL PRIMARY KEY,
+                      name VARCHAR );
+
+CREATE TABLE self_ref_alias (self_ref INTEGER NOT NULL, alias INTEGER NOT NULL,
+                      PRIMARY KEY( self_ref, alias ) );
+
 INSERT INTO artist (artistid, name) VALUES (1, 'Caterwauler McCrae');
 
 INSERT INTO artist (artistid, name) VALUES (2, 'Random Boy Band');
@@ -101,85 +105,14 @@ 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->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;
+INSERT INTO self_ref(id, name) VALUES (1, 'First');
 
-use base 'DBICTest';
+INSERT INTO self_ref(id, name) VALUES (2, 'Second');
 
-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';
+INSERT INTO self_ref_alias(self_ref, alias) VALUES (1, 2);
+EOSQL
 
-DBICTest::OneKey->table('onekey');
-DBICTest::OneKey->add_columns(qw/id artist cd/);
-DBICTest::OneKey->set_primary_key('id');
+$dbh->do($_) for split(/\n\n/, $sql);
 
 1;