X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F60core.t;h=b62b82df0ddd760aa172bf094b618d88dab62b9a;hb=905e6f073b89facb367cdedecd42ddbc5d770d61;hp=a568c6e006a9eff673d9e37f86e63be01d81fb75;hpb=5597834e4341123c5d6782ec8c0f66b4e7934e1d;p=dbsrgits%2FDBIx-Class.git diff --git a/t/60core.t b/t/60core.t index a568c6e..b62b82d 100644 --- a/t/60core.t +++ b/t/60core.t @@ -3,14 +3,14 @@ use warnings; use Test::More; use Test::Exception; +use Test::Warn; use lib qw(t/lib); use DBICTest; +use DBIC::SqlMakerTest; my $schema = DBICTest->init_schema(); -plan tests => 96; - -eval { require DateTime::Format::MySQL }; +eval { require DateTime::Format::SQLite }; my $NO_DTFM = $@ ? 1 : 0; my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'}); @@ -36,10 +36,10 @@ ok($art->update, 'Update run'); my %not_dirty = $art->get_dirty_columns(); is(scalar(keys(%not_dirty)), 0, 'Nothing is dirty'); -eval { +throws_ok ( sub { my $ret = $art->make_column_dirty('name2'); -}; -ok(defined($@), 'Failed to make non-existent column dirty'); +}, qr/No such column 'name2'/, 'Failed to make non-existent column dirty'); + $art->make_column_dirty('name'); my %fake_dirty = $art->get_dirty_columns(); is(scalar(keys(%fake_dirty)), 1, '1 fake dirty column'); @@ -105,6 +105,17 @@ is($new_again->name, 'Man With A Spoon', 'Retrieved correctly'); is($new_again->ID, 'DBICTest::Artist|artist|artistid=4', 'unique object id generated correctly'); +# test that store_column is called once for create() for non sequence columns +{ + ok(my $artist = $schema->resultset('Artist')->create({name => 'store_column test'})); + is($artist->name, 'X store_column test'); # used to be 'X X store...' + + # call store_column even though the column doesn't seem to be dirty + ok($artist->update({name => 'X store_column test'})); + is($artist->name, 'X X store_column test'); + $artist->delete; +} + # Test backwards compatibility { my $warnings = ''; @@ -194,7 +205,7 @@ is( $schema->resultset("Track")->find(100)->title, 'Insert or Update - updated', # get_inflated_columns w/relation and accessor alias SKIP: { - skip "This test requires DateTime::Format::MySQL", 8 if $NO_DTFM; + skip "This test requires DateTime::Format::SQLite", 8 if $NO_DTFM; isa_ok($new->updated_date, 'DateTime', 'have inflated object via accessor'); my %tdata = $new->get_inflated_columns; @@ -211,9 +222,9 @@ SKIP: { isa_ok($tdata{'last_updated_on'}, 'DateTime', 'inflated accessored column'); } -eval { $schema->class("Track")->load_components('DoesNotExist'); }; - -ok $@, $@; +throws_ok (sub { + $schema->class("Track")->load_components('DoesNotExist'); +}, qr!Can't locate DBIx/Class/DoesNotExist.pm!, 'exception on nonexisting component'); is($schema->class("Artist")->field_name_for->{name}, 'artist name', 'mk_classdata usage ok'); @@ -221,16 +232,19 @@ my $search = [ { 'tags.tag' => 'Cheesy' }, { 'tags.tag' => 'Blue' } ]; my( $or_rs ) = $schema->resultset("CD")->search_rs($search, { join => 'tags', order_by => 'cdid' }); -# At this point in the test there are: -# 1 artist with the cheesy AND blue tag -# 1 artist with the cheesy tag -# 2 artists with the blue tag -# -# Formerly this test expected 5 as there was no collapsing of the AND condition -is($or_rs->count, 4, 'Search with OR ok'); +is($or_rs->all, 5, 'Joined search with OR returned correct number of rows'); +is($or_rs->count, 5, 'Search count with OR ok'); -my $distinct_rs = $schema->resultset("CD")->search($search, { join => 'tags', distinct => 1 }); -is($distinct_rs->all, 4, 'DISTINCT search with OR ok'); +my $collapsed_or_rs = $or_rs->search ({}, { distinct => 1 }); # induce collapse +is ($collapsed_or_rs->all, 4, 'Collapsed joined search with OR returned correct number of rows'); +is ($collapsed_or_rs->count, 4, 'Collapsed search count with OR ok'); + +# make sure sure distinct on a grouped rs is warned about +my $cd_rs = $schema->resultset ('CD') + ->search ({}, { distinct => 1, group_by => 'title' }); +warnings_exist (sub { + $cd_rs->next; +}, qr/Useless use of distinct/, 'UUoD warning'); { my $tcount = $schema->resultset('Track')->search( @@ -265,13 +279,7 @@ my $tag_rs = $schema->resultset('Tag')->search( my $rel_rs = $tag_rs->search_related('cd'); -# At this point in the test there are: -# 1 artist with the cheesy AND blue tag -# 1 artist with the cheesy tag -# 2 artists with the blue tag -# -# Formerly this test expected 5 as there was no collapsing of the AND condition -is($rel_rs->count, 4, 'Related search ok'); +is($rel_rs->count, 5, 'Related search ok'); is($or_rs->next->cdid, $rel_rs->next->cdid, 'Related object ok'); $or_rs->reset; @@ -384,7 +392,7 @@ lives_ok (sub { my $newlink = $newbook->link}, "stringify to false value doesn't # test get_inflated_columns with objects SKIP: { - skip "This test requires DateTime::Format::MySQL", 5 if $NO_DTFM; + skip "This test requires DateTime::Format::SQLite", 5 if $NO_DTFM; my $event = $schema->resultset('Event')->search->first; my %edata = $event->get_inflated_columns; is($edata{'id'}, $event->id, 'got id'); @@ -408,3 +416,61 @@ SKIP: { $en_row->insert; is($en_row->encoded, 'amliw', 'insert does not encode again'); } + +# make sure we got rid of the compat shims +SKIP: { + skip "Remove in 0.09", 5 if $DBIx::Class::VERSION < 0.09; + + for (qw/compare_relationship_keys pk_depends_on resolve_condition resolve_join resolve_prefetch/) { + ok (! DBIx::Class::ResultSource->can ($_), "$_ no longer provided by DBIx::Class::ResultSource"); + } +} + +#------------------------------ +# READ THIS BEFORE "FIXING" +#------------------------------ +# +# make sure we got rid of discard_changes mess - this is a mess and a source +# of great confusion. Here I simply die if the methods are available, which +# is wrong on its own (we *have* to provide some sort of back-compat, even +# if with warnings). Here is how I envision things should actually be. Also +# note that a lot of the deprecation can be started today (i.e. the switch +# from get_from_storage to copy_from_storage). So: +# +# $row->discard_changes => +# warning, and delegation to reload_from_storage +# +# $row->reload_from_storage => +# does what discard changes did in 0.08 - issues a query to the db +# and repopulates all column slots, regardless of dirty states etc. +# +# $row->revert_changes => +# does what discard_changes should have done initially (before it became +# a dual-purpose call). In order to make this work we will have to +# augment $row to carry its own initial-state, much like svn has a +# copy of the current checkout in contrast to cvs. +# +# my $db_row = $row->get_from_storage => +# warns and delegates to an improved name copy_from_storage, with the +# same semantics +# +# my $db_row = $row->copy_from_storage => +# a much better/descriptive name than get_from_storage +# +#------------------------------ +# READ THIS BEFORE "FIXING" +#------------------------------ +# +SKIP: { + skip "Something needs to be done before 0.09", 2 if $DBIx::Class::VERSION < 0.09; + + my $row = $schema->resultset ('Artist')->next; + + for (qw/discard_changes get_from_storage/) { + ok (! $row->can ($_), "$_ needs *some* sort of facelift before 0.09 ships - current state of affairs is unacceptable"); + } +} + +throws_ok { $schema->resultset} qr/resultset\(\) expects a source name/, 'resultset with no argument throws exception'; + +done_testing;