[Catalyst-commits] r8606 - 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-11-17 05:38:41 +0000 (Mon, 17 Nov 2008)
New Revision: 8606

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:
pass query in related search methods

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes	2008-11-17 00:26:33 UTC (rev 8605)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes	2008-11-17 05:38:41 UTC (rev 8606)
@@ -56,3 +56,6 @@
 0.15    7 Nov 2008
         * (finally) fix load_with to be a real ro_accessor and only used in _get_objects()
 
+0.16    xxx
+        * pass query if present in *_related() query methods
+

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-11-17 00:26:33 UTC (rev 8605)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm	2008-11-17 05:38:41 UTC (rev 8606)
@@ -7,7 +7,7 @@
 use Carp;
 use Data::Dump qw( dump );
 
-our $VERSION = '0.15';
+our $VERSION = '0.16';
 
 __PACKAGE__->mk_ro_accessors(qw( name manager treat_like_int load_with ));
 __PACKAGE__->config( object_class => 'CatalystX::CRUD::Object::RDBO' );
@@ -283,6 +283,9 @@
     }
     my $query = $self->make_query;
     my @arg;
+    if ( @{ $query->{query} } ) {
+        @arg = ( query => $query->{query} );
+    }
     for (qw( limit offset sort_by )) {
         if ( exists $query->{$_} and length $query->{$_} ) {
             push( @arg, $_ => $query->{$_} );

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-11-17 00:26:33 UTC (rev 8605)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm	2008-11-17 05:38:41 UTC (rev 8606)
@@ -3,7 +3,7 @@
 use warnings;
 use base qw( CatalystX::CRUD::Object );
 
-our $VERSION = '0.15';
+our $VERSION = '0.16';
 
 =head1 NAME