X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader.pm;h=399c231005a15833c9f753aee7d929103edf7212;hb=659817cfc6f8f5dfa8dfcfa2992679d745294e3e;hp=19466a7376eae71292c43294ffc59d4edcdb37a5;hpb=83b38372e2c0578e0bf793638863984151f046bb;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index 19466a7..399c231 100644
--- a/lib/DBIx/Class/Schema/Loader.pm
+++ b/lib/DBIx/Class/Schema/Loader.pm
@@ -4,13 +4,13 @@ use strict;
 use warnings;
 use base qw/DBIx::Class::Schema Class::Accessor::Grouped/;
 use Carp::Clan qw/^DBIx::Class/;
-use Class::C3;
+use mro 'c3';
 use Scalar::Util qw/ weaken /;
 
 # Always remember to do all digits for the version even if they're 0
 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
 # brain damage and presumably various other packaging systems too
-our $VERSION = '0.05002';
+our $VERSION = '0.07003';
 
 __PACKAGE__->mk_group_accessors('inherited', qw/
                                 _loader_args
@@ -38,7 +38,9 @@ DBIx::Class::Schema::Loader - Dynamic definition of a DBIx::Class::Schema
       { debug => 1,
         dump_directory => './lib',
       },
-      [ 'dbi:Pg:dbname="foo"', 'myuser', 'mypassword' ],
+      [ 'dbi:Pg:dbname="foo"', 'myuser', 'mypassword',
+         { loader_class => 'MyLoader' } # optionally
+      ],
   );
 
   # from the command line or a shell script with dbicdump (distributed
@@ -163,11 +165,15 @@ sub _invoke_loader {
     $args->{use_namespaces} = $self->use_namespaces if $self->use_namespaces;
 
     # XXX this only works for relative storage_type, like ::DBI ...
-    my $impl = $self->loader_class
-      || "DBIx::Class::Schema::Loader" . $self->storage_type;
-    $impl = "DBIx::Class::Schema::Loader${impl}" if $impl =~ /^::/;
+    my $loader_class = $self->loader_class;
+    if ($loader_class) {
+        $loader_class = "DBIx::Class::Schema::Loader${loader_class}" if $loader_class =~ /^::/;
+        $args->{loader_class} = $loader_class;
+    };
+
+    my $impl = $loader_class || "DBIx::Class::Schema::Loader" . $self->storage_type;
     eval { $self->ensure_class_loaded($impl) };
-    croak qq/Could not load storage_type loader "$impl": "$@"/ if $@;
+    croak qq/Could not load loader_class "$impl": "$@"/ if $@;
 
     $self->_loader($impl->new(%$args));
     $self->_loader->load;
@@ -339,6 +345,8 @@ memory at runtime without generating on-disk class files.
 For a complete list of supported loader_options, see
 L<DBIx::Class::Schema::Loader::Base>
 
+The last hashref in the C<\@connect_info> can specify the L</loader_class>.
+
 This function can be imported in the usual way, as illustrated in
 these Examples:
 
@@ -348,7 +356,9 @@ these Examples:
     make_schema_at(
         'New::Schema::Name',
         { debug => 1 },
-        [ 'dbi:Pg:dbname="foo"','postgres' ],
+        [ 'dbi:Pg:dbname="foo"','postgres','',
+          { loader_class => 'MyLoader' } # optionally
+        ],
     );
 
     # Inside a script, specifying a dump directory in which to write
@@ -357,9 +367,14 @@ these Examples:
     make_schema_at(
         'New::Schema::Name',
         { debug => 1, dump_directory => './lib' },
-        [ 'dbi:Pg:dbname="foo"','postgres' ],
+        [ 'dbi:Pg:dbname="foo"','postgres','',
+          { loader_class => 'MyLoader' } # optionally
+        ],
     );
 
+The last hashref in the C<\@connect_info> is checked for loader arguments such
+as C<loader_options> and C<loader_class>, see L</connection> for more details.
+
 =cut
 
 sub make_schema_at {
@@ -370,6 +385,8 @@ sub make_schema_at {
         @{$target . '::ISA'} = qw/DBIx::Class::Schema::Loader/;
     }
 
+    eval { $target->_loader_invoked(0) };
+
     $target->loader_options($opts);
     $target->connection(@$connect_info);
 }
@@ -497,6 +514,14 @@ bphillips: Brian Phillips <bphillips@cpan.org>
 
 schwern: Michael G. Schwern <mschwern@cpan.org>
 
+hobbs: Andrew Rodland <arodland@cpan.org>
+
+domm: Thomas Klausner <domm@plix.at>
+
+spb: Stephen Bennett <spb@exherbo.org>
+
+Matias E. Fernandez <mfernandez@pisco.ch>
+
 ... and lots of other folks. If we forgot you, please write the current
 maintainer or RT.
 
@@ -516,3 +541,4 @@ L<DBIx::Class>, L<DBIx::Class::Manual::ExampleSchema>
 =cut
 
 1;
+# vim:et sts=4 sw=4 tw=0: