X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader.pm;h=17db963af939c0c5aeb716ed28d900afa561aba7;hb=9990e58f49603b81e3c1195c0e83595b0333c8df;hp=c4c128f151bfe72c07d094d0921fff4fe5fb6784;hpb=9cc8e7e177103e568c99f968ff848d25e6c3bea8;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm index c4c128f..17db963 100644 --- a/lib/DBIx/Class/Schema/Loader.pm +++ b/lib/DBIx/Class/Schema/Loader.pm @@ -2,7 +2,7 @@ package DBIx::Class::Schema::Loader; use strict; use warnings; -use base qw/DBIx::Class::Schema Class::Data::Accessor/; +use base qw/DBIx::Class::Schema Class::Accessor::Grouped/; use Carp::Clan qw/^DBIx::Class/; use Class::C3; use Scalar::Util qw/ weaken /; @@ -10,12 +10,18 @@ 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.04999_12'; - -__PACKAGE__->mk_classaccessor('_loader_args' => {}); -__PACKAGE__->mk_classaccessors(qw/ - dump_to_dir _loader_invoked _loader loader_class naming +our $VERSION = '0.07000'; + +__PACKAGE__->mk_group_accessors('inherited', qw/ + _loader_args + dump_to_dir + _loader_invoked + _loader + loader_class + naming + use_namespaces /); +__PACKAGE__->_loader_args({}); =head1 NAME @@ -32,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 @@ -70,11 +78,12 @@ DBIx::Class::Schema::Loader automates the definition of a L by scanning database table definitions and setting up the columns, primary keys, and relationships. -DBIx::Class::Schema::Loader currently supports only the DBI storage type. -It has explicit support for L, L, L, -L, and L. Other DBI drivers may function to -a greater or lesser degree with this loader, depending on how much of the -DBI spec they implement, and how standard their implementation is. +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 +MSSQL) and L. Other DBI drivers may function to a greater or +lesser degree with this loader, depending on how much of the DBI spec they +implement, and how standard their implementation is. Patches to make other DBDs work correctly welcome. @@ -134,7 +143,7 @@ already been made is useless. sub loader_options { my $self = shift; - + my %args = (ref $_[0] eq 'HASH') ? %{$_[0]} : @_; $self->_loader_args(\%args); @@ -152,14 +161,19 @@ sub _invoke_loader { $args->{schema_class} = $class; weaken($args->{schema}) if ref $self; $args->{dump_directory} ||= $self->dump_to_dir; - $args->{naming} = $self->naming; + $args->{naming} = $self->naming if $self->naming; + $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; @@ -305,6 +319,10 @@ sub import { no strict 'refs'; *{"${cpkg}::naming"} = sub { $self->naming(@_) }; } + elsif($opt eq 'use_namespaces') { + no strict 'refs'; + *{"${cpkg}::use_namespaces"} = sub { $self->use_namespaces(@_) }; + } } } @@ -327,6 +345,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: @@ -336,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 @@ -345,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 and C, see L for more details. + =cut sub make_schema_at { @@ -358,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); } @@ -399,6 +428,25 @@ Can be imported into your dump script and called as a function as well: naming('v4'); +=head2 use_namespaces + +=over 4 + +=item Arguments: 1|0 + +=back + +Controls the use_namespaces options for backward compatibility, see +L for details. + +To upgrade a dynamic schema, use: + + __PACKAGE__->use_namespaces(1); + +Can be imported into your dump script and called as a function as well: + + use_namespaces(1); + =head1 KNOWN ISSUES =head2 Multiple Database Schemas @@ -432,7 +480,7 @@ blblack: Brandon Black =head1 CONTRIBUTORS -ilmarii: Dagfinn Ilmari Mannsåker +ilmari: Dagfinn Ilmari MannsEker arcanez: Justin Hunter @@ -442,12 +490,32 @@ Caelum: Rafael Kitover TSUNODA Kazuya -Robert Bohne +rbo: Robert Bohne -ribasushi: Peter Rabbitson +ribasushi: Peter Rabbitson gugu: Andrey Kostenko +jhannah: Jay Hannah + +rbuels: Robert Buels + +timbunce: Tim Bunce + +mst: Matt S. Trout + +kane: Jos Boumans + +waawaamilk: Nigel McNie + +acmoore: Andrew Moore + +bphillips: Brian Phillips + +schwern: Michael G. Schwern + +hobbs: Andrew Rodland + ... and lots of other folks. If we forgot you, please write the current maintainer or RT. @@ -467,3 +535,4 @@ L, L =cut 1; +# vim:et sts=4 sw=4 tw=0: