C::M::DBIC::Schema - warn on create=dynamic, other cleanups, ::Role::Replicated ...

[catagits/Catalyst-Model-DBIC-Schema.git] / lib / Catalyst / Model / DBIC / Schema / Types.pm

diff --git a/lib/Catalyst/Model/DBIC/Schema/Types.pm b/lib/Catalyst/Model/DBIC/Schema/Types.pm
index b3b3e0f..989d502 100644 (file)
--- a/lib/Catalyst/Model/DBIC/Schema/Types.pm
+++ b/lib/Catalyst/Model/DBIC/Schema/Types.pm
@@ -1,10 +1,11 @@
 package Catalyst::Model::DBIC::Schema::Types;
 
 use MooseX::Types
-    -declare => [qw/ConnectInfo SchemaClass/];
+    -declare => [qw/ConnectInfo ConnectInfos Replicants SchemaClass/];
 
 use MooseX::Types::Moose qw/ArrayRef HashRef Str ClassName/;
 use Scalar::Util 'reftype';
+use List::MoreUtils 'all';
 use Carp;
 
 use namespace::clean -except => 'meta';
@@ -25,35 +26,50 @@ coerce ConnectInfo,
     from Str,
     via { +{ dsn => $_ } },
     from ArrayRef,
-    via {
-        my %connect_info;
-
-        if (!ref $_->[0]) { # array style
-            $connect_info{dsn}      = shift @$_;
-            $connect_info{user}     = shift @$_ if !ref $_->[0];
-            $connect_info{password} = shift @$_ if !ref $_->[0];
-
-            for my $i (0..1) {
-                my $extra = shift @$_;
-                last unless $extra;
-                croak "invalid connect_info" unless reftype $extra eq 'HASH';
-
-                %connect_info = (%connect_info, %$extra);
-            }
-
-            croak "invalid connect_info" if @$_;
-        } elsif (@$_ == 1 && reftype $_->[0] eq 'HASH') {
-            return $_->[0];
-        } else {
-            croak "invalid connect_info";
-        }
-
-        \%connect_info;
-};
+    via \&_coerce_connect_info_from_arrayref;
 
 # { connect_info => [ ... ] } coercion would be nice, but no chained coercions
-# yet and no coercion from subtype (yet) but in Moose git already.
+# yet.
+# Also no coercion from base type (yet,) but in Moose git already.
 #    from HashRef,
 #    via { $_->{connect_info} },
 
+subtype ConnectInfos,
+    as ArrayRef[ConnectInfo],
+    message { "Not a valid array of connect_info's" };
+
+coerce ConnectInfos,
+    from Str,
+    via  { [ { dsn => $_ } ] },
+    from ArrayRef[Str],
+    via { [ map +{ dsn => $_ }, @$_ ] },
+    from ArrayRef[ArrayRef],
+    via { [ map \&_coerce_connect_info_from_arrayref, @$_ ] };
+
+sub _coerce_connect_info_from_arrayref {
+    my %connect_info;
+
+    if (!ref $_->[0]) { # array style
+        $connect_info{dsn}      = shift @$_;
+        $connect_info{user}     = shift @$_ if !ref $_->[0];
+        $connect_info{password} = shift @$_ if !ref $_->[0];
+
+        for my $i (0..1) {
+            my $extra = shift @$_;
+            last unless $extra;
+            croak "invalid connect_info" unless reftype $extra eq 'HASH';
+
+            %connect_info = (%connect_info, %$extra);
+        }
+
+        croak "invalid connect_info" if @$_;
+    } elsif (@$_ == 1 && reftype $_->[0] eq 'HASH') {
+        return $_->[0];
+    } else {
+        croak "invalid connect_info";
+    }
+
+    \%connect_info;
+}
+
 1;