Merge c40852e into 9f681d6

frioux · Sep 8, 2016 · ece2797 · ece2797
2 parents 9f681d6 + c40852e
commit ece2797
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/DBIx/Class/Helper/Row/ToJSON.pm b/lib/DBIx/Class/Helper/Row/ToJSON.pm
@@ -50,7 +50,7 @@ sub TO_JSON {
    my $columns_info = $self->columns_info($self->serializable_columns);
 
    return {
-      map +($_ => $self->$_),
+      map {my $col=$_;$_ => UNIVERSAL::can($self->$_,'columns')?{map +(%{UNIVERSAL::can($self->$col->$_,'TO_JSON')?$self->$col->$_->TO_JSON:{$_,$self->$col->$_}}),$self->$_->columns}:$self->$_}
       map +($columns_info->{$_}{accessor} || $_),
           keys %$columns_info
    };