minor cleanups

diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index 4a94e2c..aa154cf 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -938,7 +938,11 @@ sub _populate_server_info {
   my $self = shift;
   my %info;
 
-  my $dbms_ver = eval { local $@; $self->_get_dbh->get_info(18) };
+  my $dbms_ver = eval {
+      local $@;
+      $SIG{__WARN__} = sub {};
+      $self->_get_dbh->get_info(18)
+  };
 
   if (defined $dbms_ver) {
     $info{dbms_ver} = $dbms_ver;

diff --git a/t/748informix.t b/t/748informix.t
index 02ee6bb..8ddb01a 100644 (file)
--- a/t/748informix.t
+++ b/t/748informix.t
@@ -97,7 +97,7 @@ is( $lim->next->artistid, 102, "iterator->next ok" );
 is( $lim->next, undef, "next past end of resultset ok" );
 
 # test savepoints
-eval {
+throws_ok {
   $schema->txn_do(sub {
     eval {
       $schema->txn_do(sub {
@@ -110,9 +110,7 @@ eval {
     $ars->create({ name => 'in_outer_txn' });
     die "rolling back outer txn";
   });
-};
-
-like $@, qr/rolling back outer txn/,
+} qr/rolling back outer txn/,
   'correct exception for rollback';
 
 ok ((not $ars->search({ name => 'in_outer_txn' })->first),

diff --git a/t/749sybase_asa.t b/t/749sybase_asa.t
index 5656b4c..fe984bc 100644 (file)
--- a/t/749sybase_asa.t
+++ b/t/749sybase_asa.t
@@ -61,7 +61,7 @@ EOF
   is($new->artistid, 66, 'Explicit PK assigned');
 
 # test savepoints
-  eval {
+  throws_ok {
     $schema->txn_do(sub {
       eval {
         $schema->txn_do(sub {
@@ -74,9 +74,7 @@ EOF
       $ars->create({ name => 'in_outer_txn' });
       die "rolling back outer txn";
     });
-  };
-
-  like $@, qr/rolling back outer txn/,
+  } qr/rolling back outer txn/,
     'correct exception for rollback';
 
   ok ((not $ars->search({ name => 'in_outer_txn' })->first),

diff --git a/t/750firebird.t b/t/750firebird.t
index 7e4db43..bdb3eea 100644 (file)
--- a/t/750firebird.t
+++ b/t/750firebird.t
@@ -101,7 +101,7 @@ EOF
   is($st->pkid1, 55, "Firebird Auto-PK without trigger: First primary key set manually");
 
 # test savepoints
-  eval {
+  throws_ok {
     $schema->txn_do(sub {
       eval {
         $schema->txn_do(sub {
@@ -114,9 +114,7 @@ EOF
       $ars->create({ name => 'in_outer_txn' });
       die "rolling back outer txn";
     });
-  };
-
-  like $@, qr/rolling back outer txn/,
+  } qr/rolling back outer txn/,
     'correct exception for rollback';
 
   ok ((not $ars->search({ name => 'in_outer_txn' })->first),
@@ -184,13 +182,15 @@ EOF
   is( eval { $lim->next->artistid }, 102, "iterator->next ok" );
   is( $lim->next, undef, "next past end of resultset ok" );
 
-# test multiple executing cursors
+# test nested cursors
   {
     my $rs1 = $ars->search({}, { order_by => { -asc  => 'artistid' }});
-    my $rs2 = $ars->search({}, { order_by => { -desc => 'artistid' }});
 
-    is $rs1->next->artistid, 1,   'multiple cursors';
-    is $rs2->next->artistid, 102, 'multiple cursors';
+    my $rs2 = $ars->search({ artistid => $rs1->next->artistid }, {
+      order_by => { -desc => 'artistid' }
+    });
+
+    is $rs2->next->artistid, 1, 'nested cursors';
   }
 
 # test empty insert