X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F745db2.t;h=e9a3fa6dcaf5b03875372b133487c795ff49203a;hb=6b44e3b08d4d855e971ccb756fc2038a7cb206cb;hp=90576d02159f1b27a53ea0b9ef349df3c159b241;hpb=199fbc453ec03891d0e156d7353c5e992ba4de47;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/745db2.t b/t/745db2.t
index 90576d0..e9a3fa6 100644
--- a/t/745db2.t
+++ b/t/745db2.t
@@ -1,36 +1,29 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'test_rdbms_db2';
+
 use strict;
 use warnings;
 
 use Test::More;
 use Test::Exception;
-use Try::Tiny;
-use DBIx::Class::Optional::Dependencies ();
-use lib qw(t/lib);
-use DBICTest;
 
-plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_rdbms_db2')
-  unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_rdbms_db2');
+use DBICTest;
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_DB2_${_}" } qw/DSN USER PASS/};
-
-#warn "$dsn $user $pass";
-
-plan skip_all => 'Set $ENV{DBICTEST_DB2_DSN}, _USER and _PASS to run this test'
-  unless ($dsn && $user);
-
 my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
 
+my $name_sep = $schema->storage->_dbh_get_info('SQL_QUALIFIER_NAME_SEPARATOR');
+
 my $dbh = $schema->storage->dbh;
 
 # test RNO and name_sep detection
-my $name_sep = $dbh->get_info(41);
 
 is $schema->storage->sql_maker->name_sep, $name_sep,
   'name_sep detection';
 
-my $have_rno = try {
+my $have_rno = eval {
   $dbh->selectrow_array(
-"SELECT row_number() OVER (ORDER BY 1) FROM sysibm${name_sep}sysdummy1"
+    "SELECT row_number() OVER (ORDER BY 1) FROM sysibm${name_sep}sysdummy1"
   );
   1;
 };
@@ -89,7 +82,7 @@ is( $lim->count, 2, 'ROWS+OFFSET count ok' );
 is( $lim->all, 2, 'Number of ->all objects matches count' );
 
 # Limit with select-lock
-TODO: {
+{
   local $TODO = "Seems we can't SELECT ... FOR ... on subqueries";
   lives_ok {
     $schema->txn_do (sub {
@@ -158,6 +151,7 @@ done_testing;
 
 # clean up our mess
 END {
-    my $dbh = eval { $schema->storage->_dbh };
-    $dbh->do("DROP TABLE artist") if $dbh;
+  my $dbh = eval { $schema->storage->_dbh };
+  $dbh->do("DROP TABLE artist") if $dbh;
+  undef $schema;
 }