X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F751msaccess.t;h=2b70a4aec5a7b3b9198a9c148567a69684734b87;hb=8aae794001ecccdb26c2bbd1b92c97bba9e65d79;hp=26ab187d5bc78b23e178d40a4668c96701faa949;hpb=726c8f65ef37b47aad62e29a306f64528a00f65d;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/751msaccess.t b/t/751msaccess.t
index 26ab187..2b70a4a 100644
--- a/t/751msaccess.t
+++ b/t/751msaccess.t
@@ -1,13 +1,29 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 use strict;
 use warnings;
 
 use Test::More;
 use Test::Exception;
-use Scope::Guard ();
-use Try::Tiny;
-use lib qw(t/lib);
+use DBIx::Class::Optional::Dependencies ();
+use DBIx::Class::_Util 'scope_guard';
+
 use DBICTest;
 
+my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_MSACCESS_ODBC_${_}" } qw/DSN USER PASS/};
+my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_MSACCESS_ADO_${_}" }  qw/DSN USER PASS/};
+
+plan skip_all => 'Test needs ' .
+  (join ' or ', map { $_ ? $_ : () }
+    DBIx::Class::Optional::Dependencies->req_missing_for('test_rdbms_msaccess_odbc'),
+    DBIx::Class::Optional::Dependencies->req_missing_for('test_rdbms_msaccess_ado'))
+  unless
+    $dsn && DBIx::Class::Optional::Dependencies->req_ok_for('test_rdbms_msaccess_odbc')
+    or
+    $dsn2 && DBIx::Class::Optional::Dependencies->req_ok_for('test_rdbms_msaccess_ado')
+    or
+    (not $dsn || $dsn2);
+
 DBICTest::Schema->load_classes('ArtistGUID');
 
 # Example DSNs (32bit only):
@@ -15,36 +31,23 @@ DBICTest::Schema->load_classes('ArtistGUID');
 # dbi:ADO:Microsoft.Jet.OLEDB.4.0;Data Source=C:\Users\rkitover\Documents\access_sample.accdb
 # dbi:ADO:Provider=Microsoft.ACE.OLEDB.12.0;Data Source=C:\Users\rkitover\Documents\access_sample.accdb;Persist Security Info=False'
 
-my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_MSACCESS_ODBC_${_}" } qw/DSN USER PASS/};
-my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_MSACCESS_ADO_${_}" }  qw/DSN USER PASS/};
-
 plan skip_all => <<'EOF' unless $dsn || $dsn2;
-Set $ENV{DBICTEST_MSACCESS_ODBC_DSN} and/or $ENV{DBICTEST_MSACCESS_ADO_DSN} (and optionally _USER and _PASS) to run these tests.\nWarning: this test drops and creates the tables 'artist', 'cd', 'bindtype_test' and 'artist_guid'.
+Set $ENV{DBICTEST_MSACCESS_ODBC_DSN} and/or $ENV{DBICTEST_MSACCESS_ADO_DSN} (and optionally _USER and _PASS) to run these tests.
+Warning: this test drops and creates the tables 'artist', 'cd', 'bindtype_test' and 'artist_guid'.
 EOF
 
-plan skip_all => 'Test needs ' .
-DBIx::Class::Optional::Dependencies->req_missing_for('test_rdbms_msaccess_odbc')
-. ' or ' .
-DBIx::Class::Optional::Dependencies->req_missing_for('test_rdbms_msaccess_ado')
-  unless
-    DBIx::Class::Optional::Dependencies->req_ok_for('test_rdbms_msaccess_odbc')
-    or
-    DBIx::Class::Optional::Dependencies->req_ok_for('test_rdbms_msaccess_ado');
-
 my @info = (
   [ $dsn,  $user  || '', $pass  || '' ],
   [ $dsn2, $user2 || '', $pass2 || '' ],
 );
 
-my $schema;
-
 foreach my $info (@info) {
   my ($dsn, $user, $pass) = @$info;
 
   next unless $dsn;
 
 # Check that we can connect without any options.
-  $schema = DBICTest::Schema->connect($dsn, $user, $pass);
+  my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
   lives_ok {
     $schema->storage->ensure_connected;
   } 'connection without any options';
@@ -60,7 +63,7 @@ foreach my $info (@info) {
     LongReadLen => $maxloblen,
   });
 
-  my $guard = Scope::Guard->new(\&cleanup);
+  my $guard = scope_guard { cleanup($schema) };
 
   my $dbh = $schema->storage->dbh;
 
@@ -140,21 +143,38 @@ EOF
     title => 'my track',
   });
 
-  my $joined_track = try {
-    $schema->resultset('Artist')->search({
+  my $joined_track;
+  lives_ok {
+    $joined_track = $schema->resultset('Artist')->search({
       artistid => $first_artistid,
     }, {
       join => [{ cds => 'tracks' }],
       '+select' => [ 'tracks.title' ],
       '+as'     => [ 'track_title'  ],
     })->next;
-  }
-  catch {
-    diag "Could not execute two-step join: $_";
-  };
+  } 'Two-step left join executed';
+
+  is(
+    eval { $joined_track->get_column('track_title') },
+    'my track',
+    'two-step left join works'
+  );
 
-  is try { $joined_track->get_column('track_title') }, 'my track',
-    'two-step join works';
+  lives_ok {
+    $joined_artist = $schema->resultset('Track')->search({
+      trackid => $track->trackid,
+    }, {
+      join => [{ cd => 'artist' }],
+      '+select' => [ 'artist.name' ],
+      '+as'     => [ 'artist_name'  ],
+    })->next;
+  } 'Two-step inner join executed';
+
+  is(
+    eval { $joined_artist->get_column('artist_name') },
+    'foo',
+    'two-step inner join works'
+  );
 
 # test basic transactions
   $schema->txn_do(sub {
@@ -390,6 +410,8 @@ SQL
 done_testing;
 
 sub cleanup {
+  my $schema = shift;
+
   if (my $storage = eval { $schema->storage }) {
     # cannot drop a table if it has been used, have to reconnect first
     $schema->storage->disconnect;