Changed result_source to result_source_instance in strategic places

[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 ed5a967..59c8348 100644 (file)
--- a/lib/DBIx/Class/CDBICompat/ColumnGroups.pm
+++ b/lib/DBIx/Class/CDBICompat/ColumnGroups.pm
@@ -2,9 +2,8 @@ package DBIx::Class::CDBICompat::ColumnGroups;
 
 use strict;
 use warnings;
-use NEXT;
 
-use base qw/Class::Data::Inheritable/;
+use base qw/DBIx::Class::Row/;
 
 __PACKAGE__->mk_classdata('_column_groups' => { });
 
@@ -20,18 +19,20 @@ sub columns {
 
 sub _add_column_group {
   my ($class, $group, @cols) = @_;
-  $class->_register_column_group($group => @cols);
   $class->add_columns(@cols);
+  $class->_register_column_group($group => @cols);
 }
 
 sub _register_column_group {
   my ($class, $group, @cols) = @_;
+
+  my $groups = { %{$class->_column_groups} };
+
   if ($group eq 'Primary') {
     $class->set_primary_key(@cols);
+    $groups->{'Essential'}{$_} ||= {} for @cols;
   }
 
-  my $groups = { %{$class->_column_groups} };
-
   if ($group eq 'All') {
     unless (exists $class->_column_groups->{'Primary'}) {
       $groups->{'Primary'}{$cols[0]} = {};
@@ -43,23 +44,21 @@ sub _register_column_group {
   }
 
   $groups->{$group}{$_} ||= {} for @cols;
-  if ($group eq 'Essential') {
-    $groups->{$group}{$_} ||= {} for keys %{ $class->_primaries || {} };
-  }
+
   $class->_column_groups($groups);
 }
 
-sub all_columns { return keys %{$_[0]->_columns}; }
+sub all_columns { return shift->result_source_instance->columns; }
 
 sub primary_column {
   my ($class) = @_;
-  my @pri = keys %{$class->_primaries};
+  my @pri = $class->primary_columns;
   return wantarray ? @pri : $pri[0];
 }
 
 sub find_column {
   my ($class, $col) = @_;
-  return $col if $class->_columns->{$col};
+  return $col if $class->has_column($col);
 }
 
 sub __grouper {