X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F60core.t;h=da5531fa0e0ec4321a15f0ff593eb0041ed1d15b;hb=cb566613d90f6a1ff3127641b72cc2f8fc9249d8;hp=187164dfe3583cbe994d1e6aa0c9bc94de86a0f6;hpb=1cc3ce1eef3deb794a2b2dd4cff166b91145e7c4;p=dbsrgits%2FDBIx-Class.git diff --git a/t/60core.t b/t/60core.t index 187164d..da5531f 100644 --- a/t/60core.t +++ b/t/60core.t @@ -1,18 +1,15 @@ use strict; -use warnings; +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 }; -my $NO_DTFM = $@ ? 1 : 0; - my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'}); is(@art, 3, "Three artists returned"); @@ -36,15 +33,17 @@ 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'); ok(grep($_ eq 'name', keys(%fake_dirty)), 'name is fake dirty'); +ok($art->update, 'Update run'); + my $record_jp = $schema->resultset("Artist")->search(undef, { join => 'cds' })->search(undef, { prefetch => 'cds' })->next; ok($record_jp, "prefetch on same rel okay"); @@ -65,7 +64,9 @@ lives_ok (sub { $art->delete }, 'Cascading delete on Ordered has_many works' ); is(@art, 2, 'And then there were two'); -ok(!$art->in_storage, "It knows it's dead"); +is($art->in_storage, 0, "It knows it's dead"); + +lives_ok { $art->update } 'No changes so update should be OK'; dies_ok ( sub { $art->delete }, "Can't delete twice"); @@ -105,17 +106,29 @@ 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 backwards compatibility +# test that store_column is called once for create() for non sequence columns { - my $warnings = ''; - local $SIG{__WARN__} = sub { $warnings .= $_[0] }; + ok(my $artist = $schema->resultset('Artist')->create({name => 'store_column test'})); + is($artist->name, 'X store_column test'); # used to be 'X X store...' - my $artist_by_hash = $schema->resultset('Artist')->find(artistid => 4); - is($artist_by_hash->name, 'Man With A Spoon', 'Retrieved correctly'); - is($artist_by_hash->ID, 'DBICTest::Artist|artist|artistid=4', 'unique object id generated correctly'); - like($warnings, qr/deprecated/, 'warned about deprecated find usage'); + # call store_column even though the column doesn't seem to be dirty + $artist->name($artist->name); + is($artist->name, 'X X store_column test'); + ok($artist->is_column_changed('name'), 'changed column marked as dirty'); + + $artist->delete; } +# deprecation of rolled-out search +warnings_exist { + $schema->resultset('Artist')->search_rs(id => 4) +} qr/\Qsearch( %condition ) is deprecated/, 'Deprecation warning on ->search( %condition )'; + +# this has been warning for 4 years, killing +throws_ok { + $schema->resultset('Artist')->find(artistid => 4); +} qr|expects either a column/value hashref, or a list of values corresponding to the columns of the specified unique constraint|; + is($schema->resultset("Artist")->count, 4, 'count ok'); # test find_or_new @@ -133,7 +146,7 @@ is($schema->resultset("Artist")->count, 4, 'count ok'); }); is($new_obj->name, 'find_or_new', 'find_or_new: instantiated a new artist'); - ok(! $new_obj->in_storage, 'new artist is not in storage'); + is($new_obj->in_storage, 0, 'new artist is not in storage'); } my $cd = $schema->resultset("CD")->find(1); @@ -192,10 +205,21 @@ $new->title('Insert or Update - updated'); $new->update_or_insert; is( $schema->resultset("Track")->find(100)->title, 'Insert or Update - updated', 'update_or_insert update ok'); -# get_inflated_columns w/relation and accessor alias SKIP: { - skip "This test requires DateTime::Format::MySQL", 8 if $NO_DTFM; + skip "Tests require " . DBIx::Class::Optional::Dependencies->req_missing_for ('test_dt_sqlite'), 13 + unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_dt_sqlite'); + + # test get_inflated_columns with objects + my $event = $schema->resultset('Event')->search->first; + my %edata = $event->get_inflated_columns; + is($edata{'id'}, $event->id, 'got id'); + isa_ok($edata{'starts_at'}, 'DateTime', 'start_at is DateTime object'); + isa_ok($edata{'created_on'}, 'DateTime', 'create_on DateTime object'); + is($edata{'starts_at'}, $event->starts_at, 'got start date'); + is($edata{'created_on'}, $event->created_on, 'got created date'); + + # get_inflated_columns w/relation and accessor alias isa_ok($new->updated_date, 'DateTime', 'have inflated object via accessor'); my %tdata = $new->get_inflated_columns; is($tdata{'trackid'}, 100, 'got id'); @@ -211,9 +235,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,11 +245,19 @@ my $search = [ { 'tags.tag' => 'Cheesy' }, { 'tags.tag' => 'Blue' } ]; my( $or_rs ) = $schema->resultset("CD")->search_rs($search, { join => 'tags', order_by => 'cdid' }); +is($or_rs->all, 5, 'Joined search with OR returned correct number of rows'); +is($or_rs->count, 5, 'Search count with OR ok'); -is($or_rs->count, 5, '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'); -my $distinct_rs = $schema->resultset("CD")->search($search, { join => 'tags', distinct => 1 }); -is($distinct_rs->all, 4, 'DISTINCT search 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( @@ -282,15 +314,15 @@ ok($schema->storage(), 'Storage available'); ] }); - $rs->update({ name => 'Test _cond_for_update_delete' }); + $rs->update({ rank => 6134 }); my $art; $art = $schema->resultset("Artist")->find(1); - is($art->name, 'Test _cond_for_update_delete', 'updated first artist name'); + is($art->rank, 6134, 'updated first artist rank'); $art = $schema->resultset("Artist")->find(2); - is($art->name, 'Test _cond_for_update_delete', 'updated second artist name'); + is($art->rank, 6134, 'updated second artist rank'); } # test source_name @@ -328,7 +360,67 @@ lives_ok (sub { my $newlink = $newbook->link}, "stringify to false value doesn't 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'); + ok($schema->source("Artist")->{_columns_info_loaded} == 1, 'Columns info loaded flag set'); +} + +# test columns_info +{ + $schema->source("Artist")->{_columns}{'artistid'} = {}; + $schema->source("Artist")->column_info_from_storage(1); + $schema->source("Artist")->{_columns_info_loaded} = 0; + + is_deeply ( + $schema->source('Artist')->columns_info, + { + artistid => { + data_type => "INTEGER", + default_value => undef, + is_nullable => 0, + size => undef + }, + charfield => { + data_type => "char", + default_value => undef, + is_nullable => 1, + size => 10 + }, + name => { + data_type => "varchar", + default_value => undef, + is_nullable => 1, + is_numeric => 0, + size => 100 + }, + rank => { + data_type => "integer", + default_value => 13, + is_nullable => 0, + size => undef + }, + }, + 'columns_info works', + ); + + ok($schema->source("Artist")->{_columns_info_loaded} == 1, 'Columns info loaded flag set'); + + is_deeply ( + $schema->source('Artist')->columns_info([qw/artistid rank/]), + { + artistid => { + data_type => "INTEGER", + default_value => undef, + is_nullable => 0, + size => undef + }, + rank => { + data_type => "integer", + default_value => 13, + is_nullable => 0, + size => undef + }, + }, + 'limited columns_info works', + ); } # test source_info @@ -371,18 +463,6 @@ lives_ok (sub { my $newlink = $newbook->link}, "stringify to false value doesn't ok(! exists $priv_columns->{'genreid'}, 'genreid purged from _columns'); } -# test get_inflated_columns with objects -SKIP: { - skip "This test requires DateTime::Format::MySQL", 5 if $NO_DTFM; - my $event = $schema->resultset('Event')->search->first; - my %edata = $event->get_inflated_columns; - is($edata{'id'}, $event->id, 'got id'); - isa_ok($edata{'starts_at'}, 'DateTime', 'start_at is DateTime object'); - isa_ok($edata{'created_on'}, 'DateTime', 'create_on DateTime object'); - is($edata{'starts_at'}, $event->starts_at, 'got start date'); - is($edata{'created_on'}, $event->created_on, 'got created date'); -} - # test resultsource->table return value when setting { my $class = $schema->class('Event'); @@ -397,3 +477,102 @@ SKIP: { $en_row->insert; is($en_row->encoded, 'amliw', 'insert does not encode again'); } + +#make sure multicreate encoding still works +{ + my $empl_rs = $schema->resultset('Employee'); + + my $empl = $empl_rs->create ({ + name => 'Secret holder', + secretkey => { + encoded => 'CAN HAZ', + }, + }); + is($empl->secretkey->encoded, 'ZAH NAC', 'correctly encoding on multicreate'); + + my $empl2 = $empl_rs->create ({ + name => 'Same secret holder', + secretkey => { + encoded => 'CAN HAZ', + }, + }); + is($empl2->secretkey->encoded, 'ZAH NAC', 'correctly encoding on preexisting multicreate'); + + $empl_rs->create ({ + name => 'cat1', + secretkey => { + encoded => 'CHEEZBURGER', + keyholders => [ + { + name => 'cat2', + }, + { + name => 'cat3', + }, + ], + }, + }); + + is($empl_rs->find({name => 'cat1'})->secretkey->encoded, 'REGRUBZEEHC', 'correct secret in database for empl1'); + is($empl_rs->find({name => 'cat2'})->secretkey->encoded, 'REGRUBZEEHC', 'correct secret in database for empl2'); + is($empl_rs->find({name => 'cat3'})->secretkey->encoded, 'REGRUBZEEHC', 'correct secret in database for empl3'); + +} + +# make sure we got rid of the compat shims +SKIP: { + skip "Remove in 0.082", 3 if $DBIx::Class::VERSION < 0.082; + + for (qw/compare_relationship_keys pk_depends_on resolve_condition/) { + 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;