X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader.pm;h=ab10bf5157e0ecb1436fe295b026cdb57b3aa538;hb=a47e6e743dfce14a61c2f2c4d5214d88c1c35b36;hp=6d9c568dcf54d160c53529f6febc54be14785bfb;hpb=2a5dcfb30a71cc41d4edacd37d0bb6c7e2945aba;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm index 6d9c568..ab10bf5 100644 --- a/lib/DBIx/Class/Schema/Loader.pm +++ b/lib/DBIx/Class/Schema/Loader.pm @@ -3,14 +3,15 @@ package DBIx::Class::Schema::Loader; use strict; use warnings; use base qw/DBIx::Class::Schema Class::Accessor::Grouped/; +use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; -use Class::C3; -use Scalar::Util qw/ weaken /; +use Scalar::Util 'weaken'; +use namespace::clean; # 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.05001'; +our $VERSION = '0.07010'; __PACKAGE__->mk_group_accessors('inherited', qw/ _loader_args @@ -38,7 +39,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 +79,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 @@ -102,6 +107,17 @@ the road. =head1 METHODS +=head2 loader + +The loader object, as class data on your Schema. For methods available see L and L. + +=cut + +sub loader { + my $self = shift; + $self->_loader(@_); +} + =head2 loader_class =over 4 @@ -143,45 +159,11 @@ sub loader_options { my $self = shift; my %args = (ref $_[0] eq 'HASH') ? %{$_[0]} : @_; - $self->_validate_loader_options(\%args); $self->_loader_args(\%args); $self; } -sub _validate_loader_options { - my $self = shift; - my $args = shift; - - my @class_keys = qw( - schema_base_class result_base_class additional_base_classes - left_base_classes additional_classes components resultset_components - ); - foreach my $k ( grep { exists $args->{$_} } @class_keys ) { - my @classes = ref( $args->{$k} ) eq 'ARRAY' ? @{ $args->{$k} } : $args->{$k}; - foreach my $c (@classes) { - - # components default to being under the DBIx::Class namespace unless they - # are preceeded with a '+' - if ( $k =~ m/components$/ && $c !~ s/^\+// ) { - $c = 'DBIx::Class::' . $c; - } - - # 1 == installed, 0 == not installed, undef == invalid classname - my $installed = Class::Inspector->installed($c); - if ( defined($installed) ) { - if ( $installed == 0 ) { - croak qq/$c, as specified in the loader option "$k", is not installed/; - } - } else { - croak qq/$c, as specified in the loader option "$k", is an invalid class name/; - } - } - } - - return; -} - sub _invoke_loader { my $self = shift; my $class = ref $self || $self; @@ -194,17 +176,21 @@ 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; + $self->loader($impl->new(%$args)); + $self->loader->load; $self->_loader_invoked(1); $self; @@ -373,6 +359,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: @@ -382,7 +370,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 @@ -391,9 +381,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 { @@ -404,6 +399,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); } @@ -424,7 +421,7 @@ Returns a list of the new monikers added. =cut -sub rescan { my $self = shift; $self->_loader->rescan($self) } +sub rescan { my $self = shift; $self->loader->rescan($self) } =head2 naming @@ -503,6 +500,8 @@ arcanez: Justin Hunter ash: Ash Berlin +btilly: Ben Tilly + Caelum: Rafael Kitover TSUNODA Kazuya @@ -521,6 +520,8 @@ timbunce: Tim Bunce mst: Matt S. Trout +mstratman: Mark A. Stratman + kane: Jos Boumans waawaamilk: Nigel McNie @@ -529,6 +530,18 @@ acmoore: Andrew Moore bphillips: Brian Phillips +schwern: Michael G. Schwern + +hobbs: Andrew Rodland + +domm: Thomas Klausner + +spb: Stephen Bennett + +Matias E. Fernandez + +Al Newkirk + ... and lots of other folks. If we forgot you, please write the current maintainer or RT. @@ -548,3 +561,4 @@ L, L =cut 1; +# vim:et sts=4 sw=4 tw=0: