From: Cory G Watson <gphat@cpan.org>
Date: Tue, 30 May 2006 21:05:56 +0000 (+0000)
Subject: Fix column_info stomping, test coming...
X-Git-Tag: v0.07002~75^2~148
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=416e92f76193b3215745593cd066ff9a8e3ab1b8;p=dbsrgits%2FDBIx-Class.git

Fix column_info stomping, test coming...
---

diff --git a/lib/DBIx/Class/ResultSource.pm b/lib/DBIx/Class/ResultSource.pm
index 29e17e7..689de7d 100644
--- a/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@ -184,7 +184,7 @@ sub column_info {
         $lc_info->{lc $realcol} = $info->{$realcol};
       }
       foreach my $col ( keys %{$self->_columns} ) {
-        $self->_columns->{$col} = $info->{$col} || $lc_info->{lc $col};
+        $self->_columns->{$col} = { %{ $self->_columns->{$col}}, %{$info->{$col} || $lc_info->{lc $col}} };
       }
     }
   }