use warnings;
use base 'DBIx::Class';
-use mro 'c3';
+
+# needs to be loaded early to query method attributes below
+use DBIx::Class::ResultSource;
use DBIx::Class::_Util qw( quote_sub fail_on_internal_call );
use namespace::clean;
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_column {
+sub add_column :DBIC_method_is_indirect_sugar {
DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and fail_on_internal_call;
shift->add_columns(@_)
}
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 {
+sub iterator_class :DBIC_method_is_indirect_sugar {
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/
relationship_info
has_relationship
/) {
- quote_sub __PACKAGE__."::$method_to_proxy", sprintf( <<'EOC', $method_to_proxy );
+
+ my $qsub_opts = { attributes => [ do {
+ no strict 'refs';
+ attributes::get( \&{"DBIx::Class::ResultSource::$method_to_proxy"} )
+ } ] };
+
+ quote_sub __PACKAGE__."::$method_to_proxy", sprintf( <<'EOC', $method_to_proxy ), {}, $qsub_opts;
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
}