[Bast-commits] r5085 - DBIx-Class/0.08/trunk/t

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2008-11-09 16:02:05 +0000 (Sun, 09 Nov 2008)
New Revision: 5085

Modified:
   DBIx-Class/0.08/trunk/t/19quotes_newstyle.t
   DBIx-Class/0.08/trunk/t/32connect_code_ref.t
Log:
Don't rely on connect_info(), instead fetch the dsn from _dbi_connect_info (which is stable no matter which connect_info() flavor is used)
todo: ping jnpiorkowski about Replicated::Pool and Replicated::Replicant - it blindly assumes that connect_info->[0] contains the dsn, which might not be the case. Even when using _dbi_connect_info, the first element might be a coderef

Modified: DBIx-Class/0.08/trunk/t/19quotes_newstyle.t
===================================================================
--- DBIx-Class/0.08/trunk/t/19quotes_newstyle.t	2008-11-09 15:35:30 UTC (rev 5084)
+++ DBIx-Class/0.08/trunk/t/19quotes_newstyle.t	2008-11-09 16:02:05 UTC (rev 5085)
@@ -21,7 +21,7 @@
 
 diag('Testing against ' . join(' ', map { $schema->storage->dbh->get_info($_) } qw/17 18/));
 
-my $dsn = $schema->storage->connect_info->[0];
+my $dsn = $schema->storage->_dbi_connect_info->[0];
 $schema->connection(
   $dsn,
   undef,

Modified: DBIx-Class/0.08/trunk/t/32connect_code_ref.t
===================================================================
--- DBIx-Class/0.08/trunk/t/32connect_code_ref.t	2008-11-09 15:35:30 UTC (rev 5084)
+++ DBIx-Class/0.08/trunk/t/32connect_code_ref.t	2008-11-09 16:02:05 UTC (rev 5085)
@@ -11,7 +11,7 @@
 my $normal_schema = DBICTest->init_schema( sqlite_use_file => 1 );
 
 # Steal the dsn, which should be like 'dbi:SQLite:t/var/DBIxClass.db'
-my $normal_dsn = $normal_schema->storage->connect_info->[0];
+my $normal_dsn = $normal_schema->storage->_dbi_connect_info->[0];
 
 # Make sure we have no active connection
 $normal_schema->storage->disconnect;