From: Justin Hunter Date: Sat, 2 May 2009 00:33:49 +0000 (+0000) Subject: remove hackish ways X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d2f21b377c36ca386492605c7b2c571eed09c0f6;p=dbsrgits%2FDBIx-Class-Historic.git remove hackish ways --- diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm index 2e9a8c1..e3d08d0 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm @@ -26,7 +26,7 @@ This class implements autoincrements for Oracle. use Carp::Clan qw/^DBIx::Class/; -use base qw/DBIx::Class::Storage::DBI::MultiDistinctEmulation/; +use base qw/DBIx::Class::Storage::DBI/; # __PACKAGE__->load_components(qw/PK::Auto/); diff --git a/lib/DBIx/Class/Storage/DBI/SQLite.pm b/lib/DBIx/Class/Storage/DBI/SQLite.pm index a4aeff6..5e125c9 100644 --- a/lib/DBIx/Class/Storage/DBI/SQLite.pm +++ b/lib/DBIx/Class/Storage/DBI/SQLite.pm @@ -6,7 +6,7 @@ use POSIX 'strftime'; use File::Copy; use File::Spec; -use base qw/DBIx::Class::Storage::DBI::MultiDistinctEmulation/; +use base qw/DBIx::Class::Storage::DBI/; sub _dbh_last_insert_id { my ($self, $dbh, $source, $col) = @_; diff --git a/t/60core.t b/t/60core.t index 011675b..dd41f38 100644 --- a/t/60core.t +++ b/t/60core.t @@ -28,7 +28,7 @@ if( $schema->storage->dbh->get_info(17) eq 'SQLite' && my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'}); -cmp_ok(@art, '==', 3, "Three artists returned"); +is(@art, 3, "Three artists returned"); my $art = $art[0]; @@ -39,7 +39,7 @@ $art->name('We Are In Rehab'); is($art->name, 'We Are In Rehab', "Accessor update ok"); my %dirty = $art->get_dirty_columns(); -cmp_ok(scalar(keys(%dirty)), '==', 1, '1 dirty column'); +is(scalar(keys(%dirty)), 1, '1 dirty column'); ok(grep($_ eq 'name', keys(%dirty)), 'name is dirty'); is($art->get_column("name"), 'We Are In Rehab', 'And via get_column'); @@ -47,7 +47,7 @@ is($art->get_column("name"), 'We Are In Rehab', 'And via get_column'); ok($art->update, 'Update run'); my %not_dirty = $art->get_dirty_columns(); -cmp_ok(scalar(keys(%not_dirty)), '==', 0, 'Nothing is dirty'); +is(scalar(keys(%not_dirty)), 0, 'Nothing is dirty'); eval { my $ret = $art->make_column_dirty('name2'); @@ -55,7 +55,7 @@ eval { ok(defined($@), 'Failed to make non-existent column dirty'); $art->make_column_dirty('name'); my %fake_dirty = $art->get_dirty_columns(); -cmp_ok(scalar(keys(%fake_dirty)), '==', 1, '1 fake dirty column'); +is(scalar(keys(%fake_dirty)), 1, '1 fake dirty column'); ok(grep($_ eq 'name', keys(%fake_dirty)), 'name is fake dirty'); my $record_jp = $schema->resultset("Artist")->search(undef, { join => 'cds' })->search(undef, { prefetch => 'cds' })->next; @@ -68,15 +68,15 @@ ok($record_fn, "funny join is okay"); @art = $schema->resultset("Artist")->search({ name => 'We Are In Rehab' }); -cmp_ok(@art, '==', 1, "Changed artist returned by search"); +is(@art, 1, "Changed artist returned by search"); -cmp_ok($art[0]->artistid, '==', 3,'Correct artist too'); +is($art[0]->artistid, 3,'Correct artist too'); lives_ok (sub { $art->delete }, 'Cascading delete on Ordered has_many works' ); # real test in ordered.t @art = $schema->resultset("Artist")->search({ }); -cmp_ok(@art, '==', 2, 'And then there were two'); +is(@art, 2, 'And then there were two'); ok(!$art->in_storage, "It knows it's dead"); @@ -90,15 +90,15 @@ ok($art->in_storage, "Re-created"); @art = $schema->resultset("Artist")->search({ }); -cmp_ok(@art, '==', 3, 'And now there are three again'); +is(@art, 3, 'And now there are three again'); my $new = $schema->resultset("Artist")->create({ artistid => 4 }); -cmp_ok($new->artistid, '==', 4, 'Create produced record ok'); +is($new->artistid, 4, 'Create produced record ok'); @art = $schema->resultset("Artist")->search({ }); -cmp_ok(@art, '==', 4, "Oh my god! There's four of them!"); +is(@art, 4, "Oh my god! There's four of them!"); $new->set_column('name' => 'Man With A Fork'); @@ -152,7 +152,7 @@ is($schema->resultset("Artist")->count, 4, 'count ok'); my $cd = $schema->resultset("CD")->find(1); my %cols = $cd->get_columns; -cmp_ok(keys %cols, '==', 6, 'get_columns number of columns ok'); +is(keys %cols, 6, 'get_columns number of columns ok'); is($cols{title}, 'Spoonful of bees', 'get_columns values ok'); @@ -235,31 +235,30 @@ my $search = [ { 'tags.tag' => 'Cheesy' }, { 'tags.tag' => 'Blue' } ]; my( $or_rs ) = $schema->resultset("CD")->search_rs($search, { join => 'tags', order_by => 'cdid' }); -cmp_ok($or_rs->count, '==', 5, 'Search with OR ok'); +is($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'); +is($distinct_rs->all, 4, 'DISTINCT search with OR ok'); SKIP: { skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 2 if $is_broken_sqlite; - my $tcount = $schema->resultset("Track")->search( + my $tcount = $schema->resultset('Track')->search( {}, - { - select => {count => {distinct => ['position', 'title']}}, - as => ['count'] + { + select => [ qw/position title/ ] } ); - cmp_ok($tcount->next->get_column('count'), '==', 13, 'multiple column COUNT DISTINCT ok'); - - $tcount = $schema->resultset("Track")->search( - {}, - { - columns => {count => {count => {distinct => ['position', 'title']}}}, - } - ); - cmp_ok($tcount->next->get_column('count'), '==', 13, 'multiple column COUNT DISTINCT using column syntax ok'); + is($tcount->count, 13, 'multiple column COUNT DISTINCT ok'); + + $tcount = $schema->resultset('Track')->search( + {}, + { + group_by => [ qw/position title/ ] + } + ); + is($tcount->count, 13, 'multiple column COUNT DISTINCT using column syntax ok'); } my $tag_rs = $schema->resultset('Tag')->search( @@ -267,17 +266,17 @@ my $tag_rs = $schema->resultset('Tag')->search( my $rel_rs = $tag_rs->search_related('cd'); -cmp_ok($rel_rs->count, '==', 5, 'Related search ok'); +is($rel_rs->count, 5, 'Related search ok'); -cmp_ok($or_rs->next->cdid, '==', $rel_rs->next->cdid, 'Related object ok'); +is($or_rs->next->cdid, $rel_rs->next->cdid, 'Related object ok'); $or_rs->reset; $rel_rs->reset; my $tag = $schema->resultset('Tag')->search( [ { 'me.tag' => 'Blue' } ], { cols=>[qw/tagid/] } )->next; -cmp_ok($tag->has_column_loaded('tagid'), '==', 1, 'Has tagid loaded'); -cmp_ok($tag->has_column_loaded('tag'), '==', 0, 'Has not tag loaded'); +ok($tag->has_column_loaded('tagid'), 'Has tagid loaded'); +ok(!$tag->has_column_loaded('tag'), 'Has not tag loaded'); ok($schema->storage(), 'Storage available'); @@ -309,7 +308,7 @@ ok($schema->storage(), 'Storage available'); ok($schema->source('SourceNameArtists'), 'SourceNameArtists result source exists'); my @artsn = $schema->resultset('SourceNameArtists')->search({}, { order_by => 'name DESC' }); - cmp_ok(@artsn, '==', 4, "Four artists returned"); + is(@artsn, 4, "Four artists returned"); # make sure subclasses that don't set source_name are ok ok($schema->source('ArtistSubclass'), 'ArtistSubclass exists'); @@ -323,8 +322,8 @@ lives_ok (sub { my $newlink = $newbook->link}, "stringify to false value doesn't { my $art_del = $schema->resultset("Artist")->find({ artistid => 1 }); lives_ok (sub { $art_del->delete }, 'Cascading delete on Ordered has_many works' ); # real test in ordered.t - cmp_ok( $schema->resultset("CD")->search({artist => 1}), '==', 0, 'Cascading through has_many top level.'); - cmp_ok( $schema->resultset("CD_to_Producer")->search({cd => 1}), '==', 0, 'Cascading through has_many children.'); + is( $schema->resultset("CD")->search({artist => 1}), 0, 'Cascading through has_many top level.'); + is( $schema->resultset("CD_to_Producer")->search({cd => 1}), 0, 'Cascading through has_many children.'); } # test column_info