add support for the -and, -not and -or operators (RT93864)

[catagits/Catalyst-Controller-DBIC-API.git] / lib / Catalyst / Controller / DBIC / API / Types.pm

diff --git a/lib/Catalyst/Controller/DBIC/API/Types.pm b/lib/Catalyst/Controller/DBIC/API/Types.pm
index 3632e83..0e54c11 100644 (file)
--- a/lib/Catalyst/Controller/DBIC/API/Types.pm
+++ b/lib/Catalyst/Controller/DBIC/API/Types.pm
@@ -4,7 +4,10 @@ package Catalyst::Controller::DBIC::API::Types;
 use warnings;
 use strict;
 
-use MooseX::Types -declare => [qw/OrderedBy GroupedBy Prefetch SelectColumns AsAliases ResultSource ResultSet Model SearchParameters JoinBuilder/];
+use MooseX::Types -declare => [
+    qw( OrderedBy GroupedBy Prefetch SelectColumns AsAliases ResultSource
+        ResultSet Model SearchParameters JoinBuilder )
+];
 use MooseX::Types::Moose(':all');
 
 =type Prefetch as Maybe[ArrayRef[Str|HashRef]]
@@ -38,7 +41,7 @@ Coerces Str.
 =cut
 
 subtype OrderedBy, as Maybe[ArrayRef[Str|HashRef|ScalarRef]];
-coerce OrderedBy, from Str, via { [$_] };
+coerce OrderedBy, from Str, via { [$_] }, from HashRef, via { [$_] };
 
 =type SelectColumns as Maybe[ArrayRef[Str|HashRef]]
 
@@ -49,7 +52,7 @@ Coerces Str.
 =cut
 
 subtype SelectColumns, as Maybe[ArrayRef[Str|HashRef]];
-coerce SelectColumns, from Str, via { [$_] };
+coerce SelectColumns, from Str, via { [$_] }, from HashRef, via { [$_] };
 
 =type SearchParameters as Maybe[ArrayRef[HashRef]]
 
@@ -92,7 +95,8 @@ Shortcut for Catalyst::Controller::DBIC::API::JoinBuilder
 
 =cut
 
-subtype JoinBuilder, as class_type('Catalyst::Controller::DBIC::API::JoinBuilder');
+subtype JoinBuilder,
+    as class_type('Catalyst::Controller::DBIC::API::JoinBuilder');
 
 =type Model as class_type('DBIx::Class')