C::Helper::DBIC::Schema -- parse extra Schema::Loader args

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

diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
index a42b94e..85af98f 100644 (file)
--- a/lib/Catalyst/Helper/Model/DBIC/Schema.pm
+++ b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
@@ -59,6 +59,12 @@ Use of either of the C<create=> options requires L<DBIx::Class::Schema::Loader>.
   #  and a Model which references it:
   script/myapp_create.pl model CatalystModelName DBIC::Schema MyApp::SchemaClass create=static dbi:mysql:foodb myuname mypass
 
+  # Same, but with extra Schema::Loader args such as db_schema:
+  script/myapp_create.pl model CatalystModelName DBIC::Schema MyApp::SchemaClass create=static db_schema=foodb dbi:Pg:dbname=foodb myuname mypass
+
+  # Likewise, for multiple values such as a components:
+  script/myapp_create.pl model CatalystModelName DBIC::Schema MyApp::SchemaClass create=static components=Some::Component components=Some::OtherComponent dbi:Pg:dbname=foodb myuname mypass
+
   # Create a dynamic DBIx::Class::Schema::Loader-based Schema,
   #  and a Model which references it:
   script/myapp_create.pl model CatalystModelName DBIC::Schema MyApp::SchemaClass create=dynamic dbi:mysql:foodb myuname mypass
@@ -112,6 +118,20 @@ sub mk_compclass {
         DBIx::Class::Schema::Loader->use("dump_to_dir:$schema_dir", 'make_schema_at')
             or croak "Cannot load DBIx::Class::Schema::Loader: $@";
 
+        my %extra_args;
+        while (@connect_info && $connect_info[0] !~ /^dbi:/) {
+            my ($key, $val) = split /=/, shift(@connect_info);
+
+            if (exists $extra_args{$key}) {
+                $extra_args{$key} = [ $extra_args{$key} ]
+                    unless ref $extra_args{$key};
+
+                push @{ $extra_args{$key} }, $val;
+            } else {
+                $extra_args{$key} = $val;
+            }
+        }
+
         my @loader_connect_info = @connect_info;
         my $num = 6; # argument number on the commandline for "dbi:..."
         for(@loader_connect_info) {
@@ -134,23 +154,29 @@ sub mk_compclass {
             $compatible = 1 if $schema_code =~ /->load_classes/;
         }
 
-        if ($compatible) {
-            make_schema_at(
-                $schema_class,
-                { relationships => 1 },
-                \@loader_connect_info,
-            );
-        } else { # use some saner defaults
-            make_schema_at(
-                $schema_class,
-                {
-                    relationships => 1,
-                    use_namespaces => 1,
-                    components => ['InflateColumn::DateTime']
-                },
-                \@loader_connect_info,
-            );
+        my @components = $compatible ? () : ('InflateColumn::DateTime');
+
+        if (exists $extra_args{components}) {
+            $extra_args{components} = [ $extra_args{components} ]
+                unless ref $extra_args{components};
+
+            push @components, @{ delete $extra_args{components} };
         }
+
+        make_schema_at(
+            $schema_class,
+            {
+                relationships => 1,
+                (%extra_args ? %extra_args : ()),
+                (!$compatible ? (
+                    use_namespaces => 1
+                ) : ()),
+                (@components ? (
+                    components => \@components
+                ) : ())
+            },
+            \@loader_connect_info,
+        );
     }
 
     my $file = $helper->{file};