[Bast-commits] r3433 - branches/DBIx-Class-current/lib/DBIx/Class/Storage

[blblack at dev.catalyst.perl.org]

Author: blblack
Date: 2007-05-29 19:04:38 +0100 (Tue, 29 May 2007)
New Revision: 3433

Modified:
   branches/DBIx-Class-current/lib/DBIx/Class/Storage/DBI.pm
Log:
make sure we take fresh copies of connect_info, safer than letting people mod it out from under us

Modified: branches/DBIx-Class-current/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- branches/DBIx-Class-current/lib/DBIx/Class/Storage/DBI.pm	2007-05-29 15:40:39 UTC (rev 3432)
+++ branches/DBIx-Class-current/lib/DBIx/Class/Storage/DBI.pm	2007-05-29 18:04:38 UTC (rev 3433)
@@ -464,10 +464,9 @@
   #  the new set of options
   $self->_sql_maker(undef);
   $self->_sql_maker_opts({});
-  $self->_connect_info($info_arg);
+  $self->_connect_info([@$info_arg]); # copy for _connect_info
 
-  my $dbi_info = [@$info_arg]; # copy for DBI
-  $self->_dbi_connect_info($dbi_info);
+  my $dbi_info = [@$info_arg]; # copy for _dbi_connect_info
 
   my $last_info = $dbi_info->[-1];
   if(ref $last_info eq 'HASH') {
@@ -485,8 +484,9 @@
     # Get rid of any trailing empty hashref
     pop(@$dbi_info) if !keys %$last_info;
   }
+  $self->_dbi_connect_info($dbi_info);
 
-  $info_arg;
+  $self->_connect_info;
 }
 
 =head2 on_connect_do