X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Frun%2F01core.tl;h=c41ef17a099515097ed22f792ed714e1d0472115;hb=c6d74d3ead7c87c6c63997b8e39fa638f4851559;hp=a6f5b88033fc10dec886861a1a37ba1d7d645dad;hpb=3712e4f41b929456d8fad713ca702e4a48e9a940;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/run/01core.tl b/t/run/01core.tl
index a6f5b88..c41ef17 100644
--- a/t/run/01core.tl
+++ b/t/run/01core.tl
@@ -1,8 +1,9 @@
 sub run_tests {
+my $schema = shift;
 
-plan tests => 29; 
+plan tests => 41; 
 
-my @art = DBICTest->class("Artist")->search({ }, { order_by => 'name DESC'});
+my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'});
 
 cmp_ok(@art, '==', 3, "Three artists returned");
 
@@ -18,7 +19,7 @@ is($art->get_column("name"), 'We Are In Rehab', 'And via get_column');
 
 ok($art->update, 'Update run');
 
-@art = DBICTest->class("Artist")->search({ name => 'We Are In Rehab' });
+@art = $schema->resultset("Artist")->search({ name => 'We Are In Rehab' });
 
 cmp_ok(@art, '==', 1, "Changed artist returned by search");
 
@@ -26,7 +27,7 @@ cmp_ok($art[0]->artistid, '==', 3,'Correct artist too');
 
 $art->delete;
 
-@art = DBICTest->class("Artist")->search({ });
+@art = $schema->resultset("Artist")->search({ });
 
 cmp_ok(@art, '==', 2, 'And then there were two');
 
@@ -42,15 +43,15 @@ $art->insert;
 
 ok($art->in_storage, "Re-created");
 
-@art = DBICTest->class("Artist")->search({ });
+@art = $schema->resultset("Artist")->search({ });
 
 cmp_ok(@art, '==', 3, 'And now there are three again');
 
-my $new = DBICTest->class("Artist")->create({ artistid => 4 });
+my $new = $schema->resultset("Artist")->create({ artistid => 4 });
 
 cmp_ok($new->artistid, '==', 4, 'Create produced record ok');
 
-@art = DBICTest->class("Artist")->search({ });
+@art = $schema->resultset("Artist")->search({ });
 
 cmp_ok(@art, '==', 4, "Oh my god! There's four of them!");
 
@@ -66,15 +67,15 @@ $new->name('Man With A Spoon');
 
 $new->update;
 
-$new_again = DBICTest->class("Artist")->find(4);
+$new_again = $schema->resultset("Artist")->find(4);
 
 is($new_again->name, 'Man With A Spoon', 'Retrieved correctly');
 
-is($new_again->ID, 'DBICTest::Artist|artistid=4', 'unique object id generated correctly');
+is($new_again->ID, 'DBICTest::Artist|artist|artistid=4', 'unique object id generated correctly');
 
-is(DBICTest->class("Artist")->count, 4, 'count ok');
+is($schema->resultset("Artist")->count, 4, 'count ok');
 
-my $cd = DBICTest->class("CD")->find(1);
+my $cd = $schema->resultset("CD")->find(1);
 my %cols = $cd->get_columns;
 
 cmp_ok(keys %cols, '==', 4, 'get_columns number of columns ok');
@@ -90,29 +91,75 @@ is($cd->year, 2005, 'set_columns ok');
 
 $cd->discard_changes;
 
-$cd = DBICTest->class("CD")->search({ title => 'Spoonful of bees' }, { cols => ['title'] })->next;
+# check whether ResultSource->columns returns columns in order originally supplied
+my @cd = $schema->source("CD")->columns;
+
+is_deeply( \@cd, [qw/cdid artist title year/], 'column order');
+
+$cd = $schema->resultset("CD")->search({ title => 'Spoonful of bees' }, { columns => ['title'] })->next;
 is($cd->title, 'Spoonful of bees', 'subset of columns returned correctly');
 
-# insert_or_update
-$new = DBICTest->class("Track")->new( {
+$cd = $schema->resultset("CD")->search(undef, { include_columns => [ 'artist.name' ], join => [ 'artist' ] })->find(1);
+
+is($cd->title, 'Spoonful of bees', 'Correct CD returned with include');
+is($cd->get_column('name'), 'Caterwauler McCrae', 'Additional column returned');
+
+# update_or_insert
+$new = $schema->resultset("Track")->new( {
   trackid => 100,
   cd => 1,
   position => 1,
   title => 'Insert or Update',
 } );
-$new->insert_or_update;
-ok($new->in_storage, 'insert_or_update insert ok');
+$new->update_or_insert;
+ok($new->in_storage, 'update_or_insert insert ok');
 
 # test in update mode
-$new->position(5);
-$new->insert_or_update;
-is( DBICTest->class("Track")->find(100)->position, 5, 'insert_or_update update ok');
+$new->pos(5);
+$new->update_or_insert;
+is( $schema->resultset("Track")->find(100)->pos, 5, 'update_or_insert update ok');
 
-eval { DBICTest->class("Track")->load_components('DoesNotExist'); };
+eval { $schema->class("Track")->load_components('DoesNotExist'); };
 
 ok $@, $@;
 
-is(DBICTest->class("Artist")->field_name_for->{name}, 'artist name', 'mk_classdata usage ok');
+is($schema->class("Artist")->field_name_for->{name}, 'artist name', 'mk_classdata usage ok');
+
+my $search = [ { 'tags.tag' => 'Cheesy' }, { 'tags.tag' => 'Blue' } ];
+
+my $or_rs = $schema->resultset("CD")->search($search, { join => 'tags',
+                                                  order_by => 'cdid' });
+
+cmp_ok($or_rs->count, '==', 5, 'Search with OR ok');
+
+my $distinct_rs = $schema->resultset("CD")->search($search, { join => 'tags', distinct => 1 });
+
+cmp_ok($distinct_rs->all, '==', 4, 'DISTINCT search with OR ok');
+
+my $tag_rs = $schema->resultset('Tag')->search(
+               [ { 'me.tag' => 'Cheesy' }, { 'me.tag' => 'Blue' } ]);
+
+my $rel_rs = $tag_rs->search_related('cd');
+
+cmp_ok($rel_rs->count, '==', 5, 'Related search ok');
+
+cmp_ok($or_rs->next->cdid, '==', $rel_rs->next->cdid, 'Related object ok');
+
+
+my $tag = $schema->resultset('Tag')->search(
+               [ { 'me.tag' => 'Blue' } ], { cols=>[qw/tagid/] } )->next;
+
+cmp_ok($tag->has_column_loaded('tagid'), '==', 1, 'Has tagid loaded');
+cmp_ok($tag->has_column_loaded('tag'), '==', 0, 'Has not tag  loaded');
+
+ok($schema->storage(), 'Storage available');
+
+$schema->source("Artist")->{_columns}{'artistid'} = {};
+
+my $typeinfo = $schema->source("Artist")->column_info('artistid');
+is($typeinfo->{data_type}, 'INTEGER', 'column_info ok');
+$schema->source("Artist")->column_info('artistid');
+ok($schema->source("Artist")->{_columns_info_loaded} == 1, 'Columns info flag set');
 
 }