use strict;
use warnings;
use Sub::Name ();
-use Storable 'dclone';
+use List::Util ();
use base qw/DBIx::Class::Row/;
$class->_add_column_group($group => @_) if @_;
return $class->all_columns if $group eq "All";
return $class->primary_column if $group eq "Primary";
- return keys %{$class->_column_groups->{$group}};
+
+ my $grp = $class->_column_groups->{$group};
+ my @grp_cols = sort { $grp->{$b} <=> $grp->{$a} } (keys %$grp);
+ return @grp_cols;
}
sub _add_column_group {
# Must do a complete deep copy else column groups
# might accidentally be shared.
- my $groups = dclone $class->_column_groups;
+ my $groups = DBIx::Class::_Util::deep_clone( $class->_column_groups );
if ($group eq 'Primary') {
$class->set_primary_key(@cols);
- $groups->{'Essential'}{$_} ||= 1 for @cols;
+ delete $groups->{'Essential'}{$_} for @cols;
+ my $first = List::Util::max(values %{$groups->{'Essential'}});
+ $groups->{'Essential'}{$_} = ++$first for reverse @cols;
}
if ($group eq 'All') {
}
}
- $groups->{$group}{$_} ||= 1 for @cols;
+ delete $groups->{$group}{$_} for @cols;
+ my $first = List::Util::max(values %{$groups->{$group}});
+ $groups->{$group}{$_} = ++$first for reverse @cols;
$class->_column_groups($groups);
}
sub _has_custom_accessor {
my($class, $name) = @_;
-
+
no strict 'refs';
my $existing_accessor = *{$class .'::'. $name}{CODE};
- return $existing_accessor && !$our_accessors{$existing_accessor};
+
+ return(
+ defined $existing_accessor
+ and
+ ! $our_accessors{$existing_accessor}
+ and
+ # under 5.8 mro the CODE slot may simply be a "cached method"
+ ! (
+ DBIx::Class::_ENV_::OLD_MRO
+ and
+ grep {
+ $_ ne $class
+ and
+ ($_->can($name)||0) == $existing_accessor
+ } @{mro::get_linear_isa($class)}
+ )
+ )
}
sub _deploy_accessor {
my $fullname = join '::', $class, $name;
*$fullname = Sub::Name::subname $fullname, $accessor;
}
-
+
$our_accessors{$accessor}++;
return 1;
# warn " $field $alias\n";
{
no strict 'refs';
-
+
$class->_deploy_accessor($name, $accessor);
$class->_deploy_accessor($alias, $accessor);
}