use strict;
use warnings;
-use base 'Class::Data::Inheritable';
+use base 'DBIx::Class';
use Clone;
use DBIx::Class::CDBICompat::Relationship;
+use Scalar::Util 'blessed';
use DBIx::Class::_Util qw(quote_sub perlstring);
__PACKAGE__->mk_classdata('__meta_info' => {});
sub _extend_meta {
my ($class, $type, $rel, $val) = @_;
- my %hash = %{ Clone::clone($class->__meta_info || {}) };
+
+### Explicitly not using the deep cloner as Clone exhibits specific behavior
+### wrt CODE references - it simply passes them as-is to the new structure
+### (without deparse/eval cycles). There likely is code that relies on this
+### so we just let sleeping dogs lie.
+ my $hash = Clone::clone($class->__meta_info || {});
$val->{self_class} = $class;
$val->{type} = $type;
$val->{accessor} = $rel;
- $hash{$type}{$rel} = DBIx::Class::CDBICompat::Relationship->new($val);
- $class->__meta_info(\%hash);
+ $hash->{$type}{$rel} = DBIx::Class::CDBICompat::Relationship->new($val);
+ $class->__meta_info($hash);
}
: undef());
if (ref $where eq 'HASH') {
foreach my $key (keys %$where) { # has_a deflation hack
- $where->{$key} = ''.$where->{$key}
- if eval { $where->{$key}->isa('DBIx::Class') };
+ $where->{$key} = ''.$where->{$key} if (
+ defined blessed $where->{$key}
+ and
+ $where->{$key}->isa('DBIx::Class')
+ );
}
}
$self->next::method($where, $attrs);