X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader.pm;h=f1ba452f252c942aff50ee32b92db87dfe1dc2c1;hb=0af7cacc7b7e906f0ef4b356fd9f4091d0bba01b;hp=5a273eded194ce7db53351d3eaf1bdac1576af0a;hpb=3bb5544fe304b62db827672ddab3435ebda14d7a;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm index 5a273ed..f1ba452 100644 --- a/lib/DBIx/Class/Schema/Loader.pm +++ b/lib/DBIx/Class/Schema/Loader.pm @@ -8,12 +8,15 @@ use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; use Scalar::Util 'weaken'; use Sub::Name 'subname'; +use DBIx::Class::Schema::Loader::Utils 'array_eq'; +use Try::Tiny; +use Hash::Merge 'merge'; 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.07010'; +our $VERSION = '0.07030'; __PACKAGE__->mk_group_accessors('inherited', qw/ _loader_args @@ -169,10 +172,15 @@ sub _invoke_loader { my $args = $self->_loader_args; - # set up the schema/schema_class arguments - $args->{schema} = $self; + # temporarily copy $self's storage to class + my $class_storage = $class->storage; + if (ref $self) { + $class->storage($self->storage); + $class->storage->set_schema($class); + } + + $args->{schema} = $class; $args->{schema_class} = $class; - 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 defined $self->use_namespaces; @@ -185,14 +193,76 @@ sub _invoke_loader { }; my $impl = $loader_class || "DBIx::Class::Schema::Loader" . $self->storage_type; - eval { $self->ensure_class_loaded($impl) }; - croak qq/Could not load loader_class "$impl": "$@"/ if $@; + try { + $self->ensure_class_loaded($impl) + } + catch { + croak qq/Could not load loader_class "$impl": "$_"/; + }; - $self->loader($impl->new(%$args)); - $self->loader->load; - $self->_loader_invoked(1); + $class->loader($impl->new(%$args)); + $class->loader->load; + $class->_loader_invoked(1); - $self; + # copy to $self + if (ref $self) { + $self->loader($class->loader); + $self->_loader_invoked(1); + + $self->_merge_state_from($class); + } + + # restore $class's storage + $class->storage($class_storage); + + return $self; +} + +# FIXME This needs to be moved into DBIC at some point, otherwise we are +# maintaining things to do with DBIC guts, which we have no business of +# maintaining. But at the moment it would be just dead code in DBIC, so we'll +# maintain it here. +sub _merge_state_from { + my ($self, $from) = @_; + + my $orig_class_mappings = $self->class_mappings; + my $orig_source_registrations = $self->source_registrations; + + $self->_copy_state_from($from); + + $self->class_mappings(merge($orig_class_mappings, $self->class_mappings)) + if $orig_class_mappings; + + $self->source_registrations(merge($orig_source_registrations, $self->source_registrations)) + if $orig_source_registrations; +} + +sub _copy_state_from { + my $self = shift; + my ($from) = @_; + + # older DBIC's do not have this method + if (try { DBIx::Class->VERSION('0.08197'); 1 }) { + return $self->next::method(@_); + } + else { + # this is a copy from DBIC git master pre 0.08197 + $self->class_mappings({ %{$from->class_mappings} }); + $self->source_registrations({ %{$from->source_registrations} }); + + foreach my $moniker ($from->sources) { + my $source = $from->source($moniker); + my $new = $source->new($source); + # we use extra here as we want to leave the class_mappings as they are + # but overwrite the source_registrations entry with the new source + $self->register_extra_source($moniker => $new); + } + + if ($from->storage) { + $self->storage($from->storage); + $self->storage->set_schema($self); + } + } } =head2 connection @@ -240,13 +310,29 @@ sub connection { use_namespaces => 1, ); + my $modify_isa = 0; + my @components; + if ($temp_loader->schema_base_class || $temp_loader->schema_components) { - my @components = @{ $temp_loader->schema_components } + @components = @{ $temp_loader->schema_components } if $temp_loader->schema_components; push @components, ('+'.$temp_loader->schema_base_class) if $temp_loader->schema_base_class; + my $class_isa = do { + no strict 'refs'; + \@{"${class}::ISA"}; + }; + + my @component_classes = map { + /^\+/ ? substr($_, 1, length($_) - 1) : "DBIx::Class::$_" + } @components; + + $modify_isa++ if not array_eq([ @$class_isa[0..(@components-1)] ], \@component_classes) + } + + if ($modify_isa) { $class->load_components(@components); # This hack is necessary because we changed @ISA of $self through @@ -440,10 +526,16 @@ sub make_schema_at { @{$target . '::ISA'} = qw/DBIx::Class::Schema::Loader/; } - eval { $target->_loader_invoked(0) }; + $target->_loader_invoked(0); $target->loader_options($opts); - $target->connection(@$connect_info); + + my $temp_schema = $target->connect(@$connect_info); + + $target->storage($temp_schema->storage); + $target->storage->set_schema($target); + + return $target; } =head2 rescan @@ -543,7 +635,9 @@ gugu: Andrey Kostenko jhannah: Jay Hannah -rbuels: Robert Buels +jnap: John Napiorkowski + +rbuels: Robert Buels timbunce: Tim Bunce @@ -561,6 +655,8 @@ bphillips: Brian Phillips schwern: Michael G. Schwern +SineSwiper: Brendan Byrd + hobbs: Andrew Rodland domm: Thomas Klausner @@ -571,6 +667,10 @@ Matias E. Fernandez alnewkirk: Al Newkirk +angelixd: Paul C. Mantz + +andrewalker: André Walker + ... and lots of other folks. If we forgot you, please write the current maintainer or RT. @@ -585,7 +685,8 @@ the same terms as Perl itself. =head1 SEE ALSO -L, L +L, L, L, +L =cut