projects
/
dbsrgits/DBIx-Class-Historic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
Merge 'DBIx-Class-current' into 'column_info_from_storage'
[dbsrgits/DBIx-Class-Historic.git]
/
lib
/
DBIx
/
Class
/
ResultSet.pm
diff --git
a/lib/DBIx/Class/ResultSet.pm
b/lib/DBIx/Class/ResultSet.pm
index
82109c9
..
c71043b
100644
(file)
--- a/
lib/DBIx/Class/ResultSet.pm
+++ b/
lib/DBIx/Class/ResultSet.pm
@@
-1568,7
+1568,8
@@
sub _resolved_attrs {
sub _merge_attr {
my ($self, $a, $b) = @_;
- return $b unless $a;
+ return $b unless defined($a);
+ return $a unless defined($b);
if (ref $b eq 'HASH' && ref $a eq 'HASH') {
foreach my $key (keys %{$b}) {