X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FLiveObjectIndex.pm;h=970b2d9e066c86a0a88567b4bb345bc4d05bb22b;hb=5e0eea3522876a30453af24097507198bbbc9409;hp=d62e325914d93ee6b9bb6be3af8b53eebabf7e28;hpb=de621449d983d7dbc139687a1d9f157524009942;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/CDBICompat/LiveObjectIndex.pm b/lib/DBIx/Class/CDBICompat/LiveObjectIndex.pm index d62e325..970b2d9 100644 --- a/lib/DBIx/Class/CDBICompat/LiveObjectIndex.pm +++ b/lib/DBIx/Class/CDBICompat/LiveObjectIndex.pm @@ -6,7 +6,7 @@ use warnings; use Scalar::Util qw/weaken/; -use base qw/Class::Data::Inheritable/; +use base 'DBIx::Class'; __PACKAGE__->mk_classdata('purge_object_index_every' => 1000); __PACKAGE__->mk_classdata('live_object_index' => { }); @@ -73,11 +73,8 @@ sub insert { sub inflate_result { my ($class, @rest) = @_; - - # we don't want to inflate_result on new_result - return $rest[3] if(defined $rest[3] && Scalar::Util::blessed $rest[3]); - my $new = $class->next::method(@rest); + return $new if $new->nocache; if (my $key = $new->ID) {