X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F60core.t;h=5c352b2b05ff50e7115721e7f46a8a87e4391452;hb=450e6dbf39a2620b3b9c939e8cce3c16eec766d6;hp=6094c39c3cd28143cea24f7c8397e8ada6f9cba3;hpb=a22688ab3069992b58dbd64d2b62a76744873a00;p=dbsrgits%2FDBIx-Class.git diff --git a/t/60core.t b/t/60core.t index 6094c39..5c352b2 100644 --- a/t/60core.t +++ b/t/60core.t @@ -1,8 +1,9 @@ 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; @@ -35,15 +36,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"); @@ -64,7 +67,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"); @@ -108,23 +113,24 @@ is($new_again->ID, 'DBICTest::Artist|artist|artistid=4', 'unique object id gener { 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'})); + $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; } -# Test backwards compatibility -{ - my $warnings = ''; - local $SIG{__WARN__} = sub { $warnings .= $_[0] }; +# deprecation of rolled-out search +warnings_exist { + $schema->resultset('Artist')->search_rs(id => 4) +} qr/\Qsearch( %condition ) is deprecated/, 'Deprecation warning on ->search( %condition )'; - 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'); -} +# 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'); @@ -143,7 +149,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); @@ -221,9 +227,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'); @@ -238,6 +244,13 @@ 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( {}, @@ -293,15 +306,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 @@ -339,7 +352,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 @@ -409,11 +482,52 @@ SKIP: { 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.09", 5 if $DBIx::Class::VERSION < 0.09; + skip "Remove in 0.082", 3 if $DBIx::Class::VERSION < 0.082; - for (qw/compare_relationship_keys pk_depends_on resolve_condition resolve_join resolve_prefetch/) { + for (qw/compare_relationship_keys pk_depends_on resolve_condition/) { ok (! DBIx::Class::ResultSource->can ($_), "$_ no longer provided by DBIx::Class::ResultSource"); } }