[Catalyst-commits] r8848 - in CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk: . lib/CatalystX/CRUD/Model lib/CatalystX/CRUD/Object

[karpet at dev.catalyst.perl.org]

Author: karpet
Date: 2008-12-12 17:14:11 +0000 (Fri, 12 Dec 2008)
New Revision: 8848

Modified:
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm
Log:
release 0.19

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes	2008-12-12 17:09:49 UTC (rev 8847)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes	2008-12-12 17:14:11 UTC (rev 8848)
@@ -66,3 +66,6 @@
         * fix logic for mangling sort_by with table prefix. If the sort_by value already has a . (dot)
           in it, assume the request knew what it was doing.
 
+0.19    12 Dec 2008
+        * fix long-standing issue with passing additional args to load() via CXC::Object::RDBO->read
+

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm	2008-12-12 17:09:49 UTC (rev 8847)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm	2008-12-12 17:14:11 UTC (rev 8848)
@@ -7,7 +7,7 @@
 use Carp;
 use Data::Dump qw( dump );
 
-our $VERSION = '0.18';
+our $VERSION = '0.19';
 
 __PACKAGE__->mk_ro_accessors(
     qw( name manager treat_like_int load_with related_load_with ));

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm	2008-12-12 17:09:49 UTC (rev 8847)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm	2008-12-12 17:14:11 UTC (rev 8848)
@@ -3,7 +3,7 @@
 use warnings;
 use base qw( CatalystX::CRUD::Object );
 
-our $VERSION = '0.18';
+our $VERSION = '0.19';
 
 =head1 NAME
 
@@ -36,7 +36,7 @@
 
 # convenience methods
 sub load_speculative {
-    shift->delegate->load( speculative => 1 );
+    shift->delegate->load( speculative => 1, @_ );
 }
 
 =head2 create
@@ -58,7 +58,16 @@
 =cut
 
 sub read {
-    shift->delegate->load(@_);
+
+    # because of the abusive way RDBO handles load() internally,
+    # must re-assign to delegate afterwards. This fixes esp the issue
+    # of passing 'with' => 'rel' to load().
+
+    my $cxcobj = shift;
+    my $rdbo   = $cxcobj->delegate;
+    $rdbo->load(@_);
+    $cxcobj->{delegate} = $rdbo;
+    return $cxcobj;
 }
 
 =head2 update