X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSerialize%2FStorable.pm;h=bceb1b157fb72d09035318c2e0979e0402615e98;hp=5795293a1407347c45f7c55e4cbce7c35e9d792e;hb=1b6fe47d369e84831a8a881813a53cca68694e72;hpb=e60dc79fcd4d6318e83584b826526e65048b86a9

diff --git a/lib/DBIx/Class/Serialize/Storable.pm b/lib/DBIx/Class/Serialize/Storable.pm
index 5795293..bceb1b1 100644
--- a/lib/DBIx/Class/Serialize/Storable.pm
+++ b/lib/DBIx/Class/Serialize/Storable.pm
@@ -3,23 +3,35 @@ use strict;
 use warnings;
 use Storable;
 
+use Carp::Clan qw/^DBIx::Class/;
+
+carp 'The Serialize::Storable component is now *DEPRECATED*. It has not '
+    .'been providing any useful functionality for quite a while, and in fact '
+    .'destroys prefetched results in its current implementation. Do not use!';
+
+
 sub STORABLE_freeze {
     my ($self, $cloning) = @_;
     my $to_serialize = { %$self };
 
+    # The source is either derived from _source_handle or is
+    # reattached in the thaw handler below
     delete $to_serialize->{result_source};
-    delete $to_serialize->{related_resultsets};
-    delete $to_serialize->{_inflated_column};
 
-    return('', $to_serialize);
+    # Dynamic values, easy to recalculate
+    delete $to_serialize->{$_} for qw/related_resultsets _inflated_column/;
+
+    return (Storable::nfreeze($to_serialize));
 }
 
 sub STORABLE_thaw {
-    my ($self, $cloning, $junk, $obj) = @_;
+    my ($self, $cloning, $serialized) = @_;
 
-    %$self = %{ $obj };
+    %$self = %{ Storable::thaw($serialized) };
+
+    # if the handle went missing somehow, reattach
     $self->result_source($self->result_source_instance)
-      if $self->can('result_source_instance');
+      if !$self->_source_handle && $self->can('result_source_instance');
 }
 
 1;
@@ -28,7 +40,13 @@ __END__
 
 =head1 NAME
 
-    DBIx::Class::Serialize::Storable - hooks for Storable freeze/thaw
+    DBIx::Class::Serialize::Storable - hooks for Storable nfreeze/thaw
+
+=head1 DEPRECATION NOTE
+
+This component is now B<DEPRECATED>. It has not been providing any useful
+functionality for quite a while, and in fact destroys prefetched results
+in its current implementation. Do not use!
 
 =head1 SYNOPSIS