sub run_tests {
+my $schema = shift;
-plan tests => 29;
+plan tests => 34;
-my @art = DBICTest::Artist->search({ }, { order_by => 'name DESC'});
+my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'});
cmp_ok(@art, '==', 3, "Three artists returned");
ok($art->update, 'Update run');
-@art = DBICTest::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");
$art->delete;
-@art = DBICTest::Artist->search({ });
+@art = $schema->resultset("Artist")->search({ });
cmp_ok(@art, '==', 2, 'And then there were two');
ok($art->in_storage, "Re-created");
-@art = DBICTest::Artist->search({ });
+@art = $schema->resultset("Artist")->search({ });
cmp_ok(@art, '==', 3, 'And now there are three again');
-my $new = DBICTest::Artist->create({ artistid => 4 });
+my $new = $schema->resultset("Artist")->create({ artistid => 4 });
cmp_ok($new->artistid, '==', 4, 'Create produced record ok');
-@art = DBICTest::Artist->search({ });
+@art = $schema->resultset("Artist")->search({ });
cmp_ok(@art, '==', 4, "Oh my god! There's four of them!");
$new->update;
-$new_again = DBICTest::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(DBICTest::Artist->count, 4, 'count ok');
+is($schema->resultset("Artist")->count, 4, 'count ok');
-my $cd = DBICTest::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');
$cd->discard_changes;
-$cd = DBICTest::CD->search({ title => 'Spoonful of bees' }, { cols => ['title'] })->next;
+# check whether ResultSource->ordered_columns returns columns in order originally supplied
+my @cd = $schema->source("CD")->ordered_columns;
+
+is_deeply( \@cd, [qw/cdid artist title year/], 'ordered_columns');
+
+$cd = $schema->resultset("CD")->search({ title => 'Spoonful of bees' }, { cols => ['title'] })->next;
is($cd->title, 'Spoonful of bees', 'subset of columns returned correctly');
# insert_or_update
-$new = DBICTest::Track->new( {
+$new = $schema->resultset("Track")->new( {
trackid => 100,
cd => 1,
position => 1,
# test in update mode
$new->position(5);
$new->insert_or_update;
-is( DBICTest::Track->find(100)->position, 5, 'insert_or_update update ok');
+is( $schema->resultset("Track")->find(100)->position, 5, 'insert_or_update update ok');
-eval { DBICTest::Track->load_components('DoesNotExist'); };
+eval { $schema->resultset("Track")->load_components('DoesNotExist'); };
ok $@, $@;
-is(DBICTest::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');
}