X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader.pm;h=04a850ce151862cd3f5f293d795a81666bf8a9fd;hb=refs%2Fheads%2Fregex_capture_issues;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..04a850c 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.07010'; __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 @@ -76,6 +78,8 @@ DBIx::Class::Schema::Loader automates the definition of a L by scanning database table definitions and setting up the columns, primary keys, and relationships. +See L for the C utility. + DBIx::Class::Schema::Loader currently supports only the DBI storage type. It has explicit support for L, L, L, L, L (for Sybase ASE and MSSSQL), L (for @@ -160,14 +164,18 @@ sub _invoke_loader { weaken($args->{schema}) if ref $self; $args->{dump_directory} ||= $self->dump_to_dir; $args->{naming} = $self->naming if $self->naming; - $args->{use_namespaces} = $self->use_namespaces if $self->use_namespaces; + $args->{use_namespaces} = $self->use_namespaces if defined $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 +347,8 @@ memory at runtime without generating on-disk class files. For a complete list of supported loader_options, see L +The last hashref in the C<\@connect_info> can specify the L. + This function can be imported in the usual way, as illustrated in these Examples: @@ -348,7 +358,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 +369,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 and C, see L for more details. + =cut sub make_schema_at { @@ -370,6 +387,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); } @@ -434,19 +453,7 @@ Can be imported into your dump script and called as a function as well: =head2 Multiple Database Schemas -Currently the loader is limited to working within a single schema -(using the underlying RDBMS's definition of "schema"). If you have a -multi-schema database with inter-schema relationships (which is easy -to do in PostgreSQL or DB2 for instance), you currently can only -automatically load the tables of one schema, and relationships to -tables in other schemas will be silently ignored. - -At some point in the future, an intelligent way around this might be -devised, probably by allowing the C option to be an -arrayref of schemas to load. - -In "normal" L usage, manually-defined -source classes and relationships have no problems crossing vendor schemas. +See L. =head1 ACKNOWLEDGEMENTS @@ -469,6 +476,8 @@ arcanez: Justin Hunter ash: Ash Berlin +btilly: Ben Tilly + Caelum: Rafael Kitover TSUNODA Kazuya @@ -487,6 +496,8 @@ timbunce: Tim Bunce mst: Matt S. Trout +mstratman: Mark A. Stratman + kane: Jos Boumans waawaamilk: Nigel McNie @@ -497,6 +508,14 @@ bphillips: Brian Phillips schwern: Michael G. Schwern +hobbs: Andrew Rodland + +domm: Thomas Klausner + +spb: Stephen Bennett + +Matias E. Fernandez + ... and lots of other folks. If we forgot you, please write the current maintainer or RT. @@ -516,3 +535,4 @@ L, L =cut 1; +# vim:et sts=4 sw=4 tw=0: