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

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / CDBICompat / ColumnGroups.pm

diff --git a/lib/DBIx/Class/CDBICompat/ColumnGroups.pm b/lib/DBIx/Class/CDBICompat/ColumnGroups.pm
index 47eefd5..73f845c 100644 (file)
--- a/lib/DBIx/Class/CDBICompat/ColumnGroups.pm
+++ b/lib/DBIx/Class/CDBICompat/ColumnGroups.pm
@@ -36,7 +36,7 @@ sub _add_column_group {
 
 sub add_columns {
   my ($class, @cols) = @_;
-  $class->result_source_instance->add_columns(@cols);
+  $class->result_source->add_columns(@cols);
 }
 
 sub _register_column_group {
@@ -98,7 +98,7 @@ sub _register_column_group {
         grep {
           $_ ne $class
             and
-          ($_->can($name)||0) == $existing_accessor
+          ( $Class::C3::MRO{$_} || {} )->{methods}{$name}
         } @{mro::get_linear_isa($class)}
       )
     )
@@ -148,7 +148,7 @@ sub _mk_group_accessors {
   }
 }
 
-sub all_columns { return shift->result_source_instance->columns; }
+sub all_columns { return shift->result_source->columns; }
 
 sub primary_column {
   my ($class) = @_;