X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F60core.t;h=da5531fa0e0ec4321a15f0ff593eb0041ed1d15b;hb=cb566613d90f6a1ff3127641b72cc2f8fc9249d8;hp=41adcb2bdb2236e16f62318d8f0f4858ee3afa41;hpb=de5ce4818508f52aa7489847319de5bab0ff4454;p=dbsrgits%2FDBIx-Class.git diff --git a/t/60core.t b/t/60core.t index 41adcb2..da5531f 100644 --- a/t/60core.t +++ b/t/60core.t @@ -10,9 +10,6 @@ use DBIC::SqlMakerTest; my $schema = DBICTest->init_schema(); -eval { require DateTime::Format::SQLite }; -my $NO_DTFM = $@ ? 1 : 0; - my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'}); is(@art, 3, "Three artists returned"); @@ -122,16 +119,15 @@ is($new_again->ID, 'DBICTest::Artist|artist|artistid=4', 'unique object id gener $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'); @@ -209,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::SQLite", 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'); @@ -307,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 @@ -353,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 @@ -396,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::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'); - 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');