[Bast-commits] r3355 - trunk/DBIx-Class/lib/DBIx/Class/Storage

[blblack at dev.catalyst.perl.org]

Author: blblack
Date: 2007-05-22 02:21:42 +0100 (Tue, 22 May 2007)
New Revision: 3355

Modified:
   trunk/DBIx-Class/lib/DBIx/Class/Storage/DBI.pm
Log:
connect_info should return the same data it was given

Modified: trunk/DBIx-Class/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- trunk/DBIx-Class/lib/DBIx/Class/Storage/DBI.pm	2007-05-22 00:32:35 UTC (rev 3354)
+++ trunk/DBIx-Class/lib/DBIx/Class/Storage/DBI.pm	2007-05-22 01:21:42 UTC (rev 3355)
@@ -292,8 +292,9 @@
 __PACKAGE__->load_components(qw/AccessorGroup/);
 
 __PACKAGE__->mk_group_accessors('simple' =>
-  qw/_connect_info _dbh _sql_maker _sql_maker_opts _conn_pid _conn_tid
-     debug debugobj cursor on_connect_do transaction_depth/);
+  qw/_connect_info _dbi_connect_info _dbh _sql_maker _sql_maker_opts
+     _conn_pid _conn_tid debug debugobj cursor on_connect_do
+     transaction_depth/);
 
 =head1 NAME
 
@@ -598,9 +599,10 @@
     #  the new set of options
     $self->_sql_maker(undef);
     $self->_sql_maker_opts({});
+    $self->_connect_info($info_arg);
 
-    my $info = [ @$info_arg ]; # copy because we can alter it
-    my $last_info = $info->[-1];
+    my $dbi_info = [@$info_arg]; # copy for DBI
+    my $last_info = $dbi_info->[-1];
     if(ref $last_info eq 'HASH') {
       if(my $on_connect_do = delete $last_info->{on_connect_do}) {
         $self->on_connect_do($on_connect_do);
@@ -612,10 +614,10 @@
       }
 
       # Get rid of any trailing empty hashref
-      pop(@$info) if !keys %$last_info;
+      pop(@$dbi_info) if !keys %$last_info;
     }
 
-    $self->_connect_info($info);
+    $self->_dbi_connect_info($dbi_info);
   }
 
   $self->_connect_info;
@@ -623,7 +625,7 @@
 
 sub _populate_dbh {
   my ($self) = @_;
-  my @info = @{$self->_connect_info || []};
+  my @info = @{$self->_dbi_connect_info || []};
   $self->_dbh($self->_connect(@info));
 
   if(ref $self eq 'DBIx::Class::Storage::DBI') {