X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FDBIC%2FAPI%2FRequestArguments.pm;h=adba96de15366c6a6e46571d6743b23c3bd4bca5;hb=39955b2a7f4bf1d69ba2159159ec40255e67a35c;hp=54ec8ebf30797da2f94a54c3b73de1aaa0217fa5;hpb=fa2501f0e73eb2e57f012f53b43d8a567e9e1c41;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 54ec8eb..adba96d 100644
--- a/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
+++ b/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
@@ -50,9 +50,9 @@ with 'MooseX::Role::BuildInstanceOf' =>
 parameter static => ( isa => Bool, default => 0 );
 
 role {
-    
+
     my $p = shift;
-    
+
     if($p->static)
     {
         requires qw/check_has_relation check_column_relation/;
@@ -146,7 +146,7 @@ prefetch is passed to ->search to optimize the number of database fetches for jo
     (
         is => 'ro',
         writer => '_set_prefetch',
-        isa => Prefetch, 
+        isa => Prefetch,
         default => sub { $p->static ? [] : undef },
         coerce => 1,
         trigger => sub
@@ -191,7 +191,7 @@ Like the synopsis in DBIC::API shows, you can declare a "template" of what is al
     (
         is => 'ro',
         writer => '_set_prefetch_allows',
-        isa => ArrayRef[ArrayRef|Str|HashRef], 
+        isa => ArrayRef[ArrayRef|Str|HashRef],
         default => sub { [ ] },
         predicate => 'has_prefetch_allows',
         trigger => sub
@@ -269,7 +269,7 @@ Please see L</generate_parameters_attributes> for details on how the format work
         trigger => sub
         {
             my ($self, $new) = @_;
-            
+
             if($self->has_search_exposes and @{$self->search_exposes})
             {
                 foreach my $foo (@$new)
@@ -292,7 +292,7 @@ Please see L</generate_parameters_attributes> for details on how the format work
                     }
                 }
             }
-            
+
             my ($search_parameters, $search_attributes) = $self->generate_parameters_attributes($new);
             $self->_set_search_parameters($search_parameters);
             $self->_set_search_attributes($search_attributes);
@@ -384,7 +384,7 @@ Please see L<DBIx::Class::ResultSet/select> for more details.
         default => sub { $p->static ? [] : undef },
         coerce => 1,
         trigger => sub
-        {   
+        {
             my ($self, $new) = @_;
             if($self->has_select_exposes)
             {
@@ -462,10 +462,12 @@ request_data holds the raw (but deserialized) data for ths request
         is => 'ro',
         isa => HashRef,
         writer => '_set_request_data',
+        predicate => 'has_request_data',
         trigger => sub
         {
             my ($self, $new) = @_;
             my $controller = $self->_controller;
+            return unless defined($new) && keys %$new;
             $self->_set_prefetch($new->{$controller->prefetch_arg}) if exists $new->{$controller->prefetch_arg};
             $self->_set_select($new->{$controller->select_arg}) if exists $new->{$controller->select_arg};
             $self->_set_as($new->{$controller->as_arg}) if exists $new->{$controller->as_arg};
@@ -488,9 +490,8 @@ format_search_parameters iterates through the provided params ArrayRef, calling
 
     method format_search_parameters => sub
     {
-        $DB::single = 1;
         my ($self, $params) = @_;
-        
+
         my $genparams = [];
 
         foreach my $param (@$params)
@@ -509,7 +510,6 @@ generate_column_parameters recursively generates properly aliased parameters for
 
     method generate_column_parameters => sub
     {
-        $DB::single = 1;
         my ($self, $source, $param, $join, $base) = @_;
         $base ||= 'me';
         my $search_params;
@@ -525,7 +525,7 @@ generate_column_parameters recursively generates properly aliased parameters for
                     next;
                 }
 
-                %$search_params = 
+                %$search_params =
                 %{
                     $self->generate_column_parameters
                     (
@@ -553,7 +553,6 @@ generate_parameters_attributes takes the raw search arguments and formats the pa
 
     method generate_parameters_attributes => sub
     {
-        $DB::single = 1;
         my ($self, $args) = @_;
 
         return ( $self->format_search_parameters($args), $self->search_attributes );
@@ -569,7 +568,7 @@ This builder method generates the search attributes
     {
         my ($self, $args) = @_;
         my $static = $self->_controller;
-        my $search_attributes = 
+        my $search_attributes =
         {
             group_by => $self->grouped_by || ((scalar(@{$static->grouped_by})) ? $static->grouped_by : undef),
             order_by => $self->ordered_by || ((scalar(@{$static->ordered_by})) ? $static->ordered_by : undef),
@@ -590,15 +589,15 @@ This builder method generates the search attributes
             $search_attributes->{page} = $search_attributes->{offset} / $search_attributes->{rows} + 1;
             delete $search_attributes->{offset};
         }
-        
 
-        $search_attributes = 
-        {   
+
+        $search_attributes =
+        {
             map { @$_ }
             grep
             {
-                defined($_->[1]) 
-                ? 
+                defined($_->[1])
+                ?
                     (ref($_->[1]) && reftype($_->[1]) eq 'HASH' && keys %{$_->[1]})
                     || (ref($_->[1]) && reftype($_->[1]) eq 'ARRAY' && @{$_->[1]})
                     || length($_->[1])
@@ -613,7 +612,7 @@ This builder method generates the search attributes
         if ($search_attributes->{page} && !$search_attributes->{rows}) {
             die 'list_page can only be used with list_count';
         }
-        
+
         if ($search_attributes->{select}) {
             # make sure all columns have an alias to avoid ambiguous issues
             # but allow non strings (eg. hashrefs for db procs like 'count')
@@ -622,7 +621,7 @@ This builder method generates the search attributes
         }
 
         return $search_attributes;
-        
+
     };
 
 };