[Bast-commits] r4919 - in DBIx-Class/0.08/trunk: lib/DBIx/Class t
ribasushi at dev.catalyst.perl.org
ribasushi at dev.catalyst.perl.org
Sun Oct 12 22:54:53 BST 2008
Author: ribasushi
Date: 2008-10-12 22:54:53 +0100 (Sun, 12 Oct 2008)
New Revision: 4919
Modified:
DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
DBIx-Class/0.08/trunk/t/77prefetch.t
Log:
Downgrading multi-prefetch exception to a warning as per Moritz Onken, adjusting tests
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm 2008-10-12 21:26:54 UTC (rev 4918)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm 2008-10-12 21:54:53 UTC (rev 4919)
@@ -961,11 +961,16 @@
if (my ($fail) = grep { @{[$_ =~ m/\./g]} == $dots }
keys %{$collapse}) {
my ($last) = ($fail =~ /([^\.]+)$/);
- $self->throw_exception(
- "Can't prefetch multiple has_many rels ${last} and ${pre}"
- .(length($as_prefix) ? "at the same level (${as_prefix})"
- : "at top level"
- ));
+ carp (
+ "Prefetching multiple has_many rels ${last} and ${pre} "
+ .(length($as_prefix)
+ ? "at the same level (${as_prefix}) "
+ : "at top level "
+ )
+ . 'will currently disrupt both the functionality of $rs->count(), '
+ . 'and the amount of objects retrievable via $rs->next(). '
+ . 'Use at your own risk.'
+ );
}
#my @col = map { (/^self\.(.+)$/ ? ("${as_prefix}.$1") : ()); }
# values %{$rel_info->{cond}};
Modified: DBIx-Class/0.08/trunk/t/77prefetch.t
===================================================================
--- DBIx-Class/0.08/trunk/t/77prefetch.t 2008-10-12 21:26:54 UTC (rev 4918)
+++ DBIx-Class/0.08/trunk/t/77prefetch.t 2008-10-12 21:54:53 UTC (rev 4919)
@@ -344,10 +344,10 @@
is($queries, 0, 'chained search_related after has_many->has_many prefetch ran no queries');
-# once the following TODO is complete, remove the 2 stop-gap tests immediately after the TODO block
-# (the TODO block itself contains tests ensuring that the stop-gaps are removed)
+# once the following TODO is complete, remove the 2 warning tests immediately after the TODO block
+# (the TODO block itself contains tests ensuring that the warns are removed)
TODO: {
- local $TODO = 'Prefetch of multiple has_many rels at the same level (currently must die to protect the clueless git)';
+ local $TODO = 'Prefetch of multiple has_many rels at the same level (currently warn to protect the clueless git)';
use DBIx::Class::ResultClass::HashRefInflator;
#( 1 -> M + M )
@@ -364,26 +364,24 @@
$queries = 0;
$schema->storage->debugcb(sub { $queries++ });
$schema->storage->debug(1);
- eval {
+
+ my $o_mm_warn;
+ {
+ local $SIG{__WARN__} = sub { $o_mm_warn = shift };
$pr_tracks_rs = $pr_cd_rs->first->tracks;
- $pr_tracks_count = $pr_tracks_rs->count;
};
+ $pr_tracks_count = $pr_tracks_rs->count;
- my $o_mm_exc = $@;
- ok(! $o_mm_exc, 'exception on attempt to prefetch several same level has_many\'s (1 -> M + M)');
+ ok(! $o_mm_warn, 'no warning on attempt to prefetch several same level has_many\'s (1 -> M + M)');
- SKIP: {
- skip "1 -> M + M prefetch died", 3 if $o_mm_exc;
-
- is($queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query');
- is($pr_tracks_count, $tracks_count, 'equal count of prefetched relations over several same level has_many\'s (1 -> M + M)');
+ is($queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query');
+ is($pr_tracks_count, $tracks_count, 'equal count of prefetched relations over several same level has_many\'s (1 -> M + M)');
- for ($pr_tracks_rs, $tracks_rs) {
- $_->result_class ('DBIx::Class::ResultClass::HashRefInflator');
- }
+ for ($pr_tracks_rs, $tracks_rs) {
+ $_->result_class ('DBIx::Class::ResultClass::HashRefInflator');
+ }
- is_deeply ([$pr_tracks_rs->all], [$tracks_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (1 -> M + M)');
- };
+ is_deeply ([$pr_tracks_rs->all], [$tracks_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (1 -> M + M)');
#( M -> 1 -> M + M )
my $note_rs = $schema->resultset('LinerNotes')->search ({ notes => 'Buy Whiskey!' });
@@ -401,30 +399,36 @@
$queries = 0;
$schema->storage->debugcb(sub { $queries++ });
$schema->storage->debug(1);
- eval {
+
+ my $m_o_mm_warn;
+ {
+ local $SIG{__WARN__} = sub { $m_o_mm_warn = shift };
$pr_tags_rs = $pr_note_rs->first->cd->tags;
- $pr_tags_count = $pr_tags_rs->count;
};
+ $pr_tags_count = $pr_tags_rs->count;
- my $m_o_mm_exc = $@;
- ok(! $m_o_mm_exc, 'exception on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)');
+ ok(! $m_o_mm_warn, 'no warning on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)');
- SKIP: {
- skip "M -> 1 -> M + M prefetch died", 3 if $m_o_mm_exc;
-
- is($queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query');
+ is($queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query');
- is($pr_tags_count, $tags_count, 'equal count of prefetched relations over several same level has_many\'s (M -> 1 -> M + M)');
+ is($pr_tags_count, $tags_count, 'equal count of prefetched relations over several same level has_many\'s (M -> 1 -> M + M)');
- for ($pr_tags_rs, $tags_rs) {
- $_->result_class ('DBIx::Class::ResultClass::HashRefInflator');
- }
+ for ($pr_tags_rs, $tags_rs) {
+ $_->result_class ('DBIx::Class::ResultClass::HashRefInflator');
+ }
- is_deeply ([$pr_tags_rs->all], [$tags_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (M -> 1 -> M + M)');
- };
+ is_deeply ([$pr_tags_rs->all], [$tags_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (M -> 1 -> M + M)');
};
-eval { my $track = $schema->resultset('CD')->search ({ 'me.title' => 'Forkful of bees' }, { prefetch => [qw/tracks tags/] })->first->tracks->first };
-ok ($@, 'exception on attempt to prefetch several same level has_many\'s (1 -> M + M)');
-eval { my $tag = $schema->resultset('LinerNotes')->search ({ notes => 'Buy Whiskey!' }, { prefetch => { cd => [qw/tags tracks/] } })->first->cd->tags->first };
-ok ($@, 'exception on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)');
+# remove this closure once the TODO above is working
+my $w;
+{
+ local $SIG{__WARN__} = sub { $w = shift };
+
+ my $track = $schema->resultset('CD')->search ({ 'me.title' => 'Forkful of bees' }, { prefetch => [qw/tracks tags/] })->first->tracks->first;
+ like ($w, qr/will currently disrupt both the functionality of .rs->count\(\), and the amount of objects retrievable via .rs->next\(\)/,
+ 'warning on attempt to prefetch several same level has_many\'s (1 -> M + M)');
+ my $tag = $schema->resultset('LinerNotes')->search ({ notes => 'Buy Whiskey!' }, { prefetch => { cd => [qw/tags tracks/] } })->first->cd->tags->first;
+ like ($w, qr/will currently disrupt both the functionality of .rs->count\(\), and the amount of objects retrievable via .rs->next\(\)/,
+ 'warning on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)');
+}
More information about the Bast-commits
mailing list