From: Peter Rabbitson Date: Mon, 22 Sep 2008 01:00:53 +0000 (+0000) Subject: Merge 'trunk' into 'warnfree' X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dbf954163eb5a9f39ede6f30d1a965c7d3179d81;p=dbsrgits%2FDBIx-Class-Historic.git Merge 'trunk' into 'warnfree' Blindly silence a weird warning within a TODO in t/47bind_attribute.t. Hopefully when the TODO is resolved, it will be obvious what was causing it Merge the t/93single_accessor_object.t fix from trunk --- dbf954163eb5a9f39ede6f30d1a965c7d3179d81 diff --cc t/47bind_attribute.t index 8f66f6c,8f66f6c..3bc1935 --- a/t/47bind_attribute.t +++ b/t/47bind_attribute.t @@@ -73,6 -73,6 +73,10 @@@ $rs = $schema->resultset('Complex')->se is ( $rs->count, 1, '...cookbook (bind first) + chained search' ); TODO: { ++ # not sure what causes an uninit warning here, please remove when the TODO starts to pass, ++ # so the real reason for the warning can be found and fixed ++ local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /uninitialized/ }; ++ local $TODO = 'bind args order needs fixing (semifor)'; $rs = $schema->resultset('Complex')->search({}, { bind => [ 1999 ] }) ->search({ 'artistid' => 1 }, {