Remove Class::Data::Inheritable and use CAG 'inherited' style accessors

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / CDBICompat / LiveObjectIndex.pm

diff --git a/lib/DBIx/Class/CDBICompat/LiveObjectIndex.pm b/lib/DBIx/Class/CDBICompat/LiveObjectIndex.pm
index d62e325..970b2d9 100644 (file)
--- 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) {