X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Controller-DBIC-API.git;a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FDBIC%2FAPI%2FRequestArguments.pm;h=7b961b4819ecb689b10664a403a9fbad05f098bf;hp=54ec8ebf30797da2f94a54c3b73de1aaa0217fa5;hb=533075c7cc1bfd0ed993d273314ad46f0d85401b;hpb=fa2501f0e73eb2e57f012f53b43d8a567e9e1c41 diff --git a/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm b/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm index 54ec8eb..7b961b4 100644 --- a/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm +++ b/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm @@ -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,7 +490,6 @@ format_search_parameters iterates through the provided params ArrayRef, calling method format_search_parameters => sub { - $DB::single = 1; my ($self, $params) = @_; my $genparams = []; @@ -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; @@ -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 );