use warnings;
use base 'DBIx::Class';
-use mro 'c3';
-use Scalar::Util 'blessed';
use DBIx::Class::_Util qw( quote_sub fail_on_internal_call );
use namespace::clean;
__PACKAGE__->mk_group_accessors('inherited_ro_instance' => 'source_name');
-sub get_inherited_ro_instance { shift->get_inherited(@_) }
+sub get_inherited_ro_instance { $_[0]->get_inherited($_[1]) }
sub set_inherited_ro_instance {
- my $self = shift;
+ $_[0]->throw_exception ("Cannot set '$_[1]' on an instance")
+ if length ref $_[0];
- $self->throw_exception ("Cannot set @{[shift]} on an instance")
- if blessed $self;
-
- $self->set_inherited(@_);
+ $_[0]->set_inherited( $_[1], $_[2] );
}
sub add_columns {
my ($class, @cols) = @_;
- my $source = $class->result_source_instance;
+ my $source = $class->result_source;
$source->add_columns(@cols);
+
+ my $colinfos;
foreach my $c (grep { !ref } @cols) {
# If this is an augment definition get the real colname.
$c =~ s/^\+//;
- $class->register_column($c => $source->column_info($c));
+ $class->register_column(
+ $c,
+ ( $colinfos ||= $source->columns_info )->{$c}
+ );
}
}
sub add_relationship {
my ($class, $rel, @rest) = @_;
- my $source = $class->result_source_instance;
+ my $source = $class->result_source;
$source->add_relationship($rel => @rest);
$class->register_relationship($rel => $source->relationship_info($rel));
}
# legacy resultset_class accessor, seems to be used by cdbi only
sub iterator_class {
DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
- shift->result_source_instance->resultset_class(@_)
+ shift->result_source->resultset_class(@_)
}
for my $method_to_proxy (qw/
/) {
quote_sub __PACKAGE__."::$method_to_proxy", sprintf( <<'EOC', $method_to_proxy );
DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and DBIx::Class::_Util::fail_on_internal_call;
- shift->result_source_instance->%s (@_);
+
+ shift->result_source->%s (@_);
EOC
}