Centralize all user-side rsrc calls to go through result_source()

[dbsrgits/DBIx-Class-Historic.git] / lib / DBIx / Class / ResultSourceProxy.pm

diff --git a/lib/DBIx/Class/ResultSourceProxy.pm b/lib/DBIx/Class/ResultSourceProxy.pm
index 0f5e9d9..cfd37ca 100644 (file)
--- a/lib/DBIx/Class/ResultSourceProxy.pm
+++ b/lib/DBIx/Class/ResultSourceProxy.pm
@@ -5,7 +5,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class';
-use mro 'c3';
 
 use DBIx::Class::_Util qw( quote_sub fail_on_internal_call );
 use namespace::clean;
@@ -24,13 +23,18 @@ sub set_inherited_ro_instance {
 
 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}
+    );
   }
 }
 
@@ -42,7 +46,7 @@ sub add_column {
 
 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));
 }
@@ -51,7 +55,7 @@ sub add_relationship {
 # 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/
@@ -87,7 +91,8 @@ 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
 
 }