X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FColumnGroups.pm;h=4c0b148dd1c0ac82c86cf5ef9ec94dfb1ecdc82b;hb=78bab9cad621ac5e3d1d12b02c41d662dec7a22a;hp=ed5a967c80a15eba6f310cc27c4dc526d9bfa43a;hpb=510ca9120ab2fea50a0852ee4ed6a13735ed7ebc;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/CDBICompat/ColumnGroups.pm b/lib/DBIx/Class/CDBICompat/ColumnGroups.pm index ed5a967..4c0b148 100644 --- a/lib/DBIx/Class/CDBICompat/ColumnGroups.pm +++ b/lib/DBIx/Class/CDBICompat/ColumnGroups.pm @@ -26,26 +26,31 @@ sub _add_column_group { 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]} = {}; $class->set_primary_key($cols[0]); } unless (exists $class->_column_groups->{'Essential'}) { + #$class->_register_column_group('Essential' => $cols[0]); $groups->{'Essential'}{$cols[0]} = {}; + #$groups->{'Essential'}{$_} ||= {} for keys %{ $class->_primaries || {} }; } } $groups->{$group}{$_} ||= {} for @cols; - if ($group eq 'Essential') { - $groups->{$group}{$_} ||= {} for keys %{ $class->_primaries || {} }; - } + #if ($group eq 'Essential') { + # $groups->{$group}{$_} ||= {} for keys %{ $class->_primaries || {} }; + #} + $class->_column_groups($groups); }