X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FDBIC%2FAPI%2FRequestArguments.pm;h=e920857892c44b3d14bf305acbe86eeba318cb34;hb=04f135e4176ab36780d168136947d1a748178ca7;hp=adba96de15366c6a6e46571d6743b23c3bd4bca5;hpb=406086f3da2f020cf98b01d994ffe2d1b8a478c4;p=catagits%2FCatalyst-Controller-DBIC-API.git

diff --git a/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm b/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
index adba96d..e920857 100644
--- a/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
+++ b/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
@@ -10,7 +10,6 @@ use namespace::autoclean;
 
 use Catalyst::Controller::DBIC::API::JoinBuilder;
 
-
 =attribute_private search_validator
 
 A Catalyst::Controller::DBIC::API::Validator instance used solely to validate search parameters
@@ -198,13 +197,13 @@ Like the synopsis in DBIC::API shows, you can declare a "template" of what is al
         {
             my ($self, $new) = @_;
 
-            sub check_rel {
+            sub _check_rel {
                 my ($self, $rel, $static) = @_;
                 if(ArrayRef->check($rel))
                 {
                     foreach my $rel_sub (@$rel)
                     {
-                        $self->check_rel($rel_sub, $static);
+                        $self->_check_rel($rel_sub, $static);
                     }
                 }
                 elsif(HashRef->check($rel))
@@ -224,7 +223,7 @@ Like the synopsis in DBIC::API shows, you can declare a "template" of what is al
 
             foreach my $rel (@$new)
             {
-                $self->check_rel($rel, $p->static);
+                $self->_check_rel($rel, $p->static);
             }
         },
     );
@@ -512,7 +511,7 @@ generate_column_parameters recursively generates properly aliased parameters for
     {
         my ($self, $source, $param, $join, $base) = @_;
         $base ||= 'me';
-        my $search_params;
+        my $search_params = {};
 
         # build up condition
         foreach my $column (keys %$param)
@@ -525,8 +524,7 @@ generate_column_parameters recursively generates properly aliased parameters for
                     next;
                 }
 
-                %$search_params =
-                %{
+                $search_params = { %$search_params, %{
                     $self->generate_column_parameters
                     (
                         $source->related_source($column),
@@ -534,7 +532,7 @@ generate_column_parameters recursively generates properly aliased parameters for
                         Catalyst::Controller::DBIC::API::JoinBuilder->new(parent => $join, name => $column),
                         $column
                     )
-                };
+                }};
             }
             else
             {