use Carp::Clan qw/^DBIx::Class/;
use Scalar::Util 'weaken';
use Sub::Name 'subname';
+use DBIx::Class::Schema::Loader::Utils 'array_eq';
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.07013';
__PACKAGE__->mk_group_accessors('inherited', qw/
_loader_args
=cut
sub connection {
- my $self = shift;
+ my $self = shift;
+ my $class = ref $self || $self;
if($_[-1] && ref $_[-1] eq 'HASH') {
for my $option (qw/loader_class loader_options/) {
# before connecting.
require DBIx::Class::Schema::Loader::Base;
my $temp_loader = DBIx::Class::Schema::Loader::Base->new(
- %{ $self->_loader_args }
+ %{ $self->_loader_args },
+ schema => $self,
+ naming => 'current',
+ 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;
- $self->load_components(@components);
+ 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
- # ->load_components.
+ # ->load_components and we are now in a different place in the mro.
no warnings 'redefine';
local *connection = subname __PACKAGE__.'::connection' => sub {
$self->next::method(@_);
};
- $self = $self->connection(@_);
+ my @linear_isa = @{ mro::get_linear_isa($class) };
+
+ my $next_method;
+
+ foreach my $i (1..$#linear_isa) {
+ no strict 'refs';
+ $next_method = *{$linear_isa[$i].'::connection'}{CODE};
+ last if $next_method;
+ }
+
+ $self = $self->$next_method(@_);
}
else {
$self = $self->next::method(@_);
}
- my $class = ref $self || $self;
if(!$class->_loader_invoked) {
$self->_invoke_loader
}
Matias E. Fernandez <mfernandez@pisco.ch>
-Al Newkirk <awncorp@cpan.org>
+alnewkirk: Al Newkirk <awncorp@cpan.org>
... and lots of other folks. If we forgot you, please write the current
maintainer or RT.
=head1 SEE ALSO
-L<DBIx::Class>, L<DBIx::Class::Manual::ExampleSchema>
+L<DBIx::Class>, L<DBIx::Class::Manual::Intro>, L<DBIx::Class::Tutorial>,
+L<DBIx::Class::Schema::Loader::Base>
=cut