Make Access inner joins 'INNER JOIN' to avoid JOIN syntax errors

[dbsrgits/DBIx-Class-Historic.git] / t / 751msaccess.t

diff --git a/t/751msaccess.t b/t/751msaccess.t
index 26ab187..27eeac9 100644 (file)
--- a/t/751msaccess.t
+++ b/t/751msaccess.t
@@ -7,6 +7,8 @@ use Scope::Guard ();
 use Try::Tiny;
 use lib qw(t/lib);
 use DBICTest;
+use DBIC::DebugObj ();
+use DBIC::SqlMakerTest;
 
 DBICTest::Schema->load_classes('ArtistGUID');
 
@@ -19,7 +21,8 @@ my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_MSACCESS_ODBC_${_}" } qw/DSN U
 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 ' .
@@ -140,7 +143,12 @@ EOF
     title => 'my track',
   });
 
+  my ($sql, @bind);
+
   my $joined_track = try {
+    local $schema->storage->{debug} = 1;
+    local $schema->storage->{debugobj} = DBIC::DebugObj->new(\$sql, \@bind);
+
     $schema->resultset('Artist')->search({
       artistid => $first_artistid,
     }, {
@@ -150,11 +158,52 @@ EOF
     })->next;
   }
   catch {
-    diag "Could not execute two-step join: $_";
+    diag "Could not execute two-step left join: $_";
   };
 
+  s/^'//, s/'\z// for @bind;
+
+  is_same_sql_bind(
+    $sql,
+    \@bind,
+    'SELECT [me].[artistid], [me].[name], [me].[rank], [me].[charfield], [tracks].[title] FROM ( ( [artist] [me] LEFT JOIN cd [cds] ON [cds].[artist] = [me].[artistid] ) LEFT JOIN [track] [tracks] ON [tracks].[cd] = [cds].[cdid] ) WHERE ( [artistid] = ? )',
+    [1],
+    'correct SQL for two-step left join',
+  );
+
   is try { $joined_track->get_column('track_title') }, 'my track',
-    'two-step join works';
+    'two-step left join works';
+
+  ($sql, @bind) = ();
+
+  $joined_artist = try {
+    local $schema->storage->{debug} = 1;
+    local $schema->storage->{debugobj} = DBIC::DebugObj->new(\$sql, \@bind);
+
+    $schema->resultset('Track')->search({
+      trackid => $track->trackid,
+    }, {
+      join => [{ cd => 'artist' }],
+      '+select' => [ 'artist.name' ],
+      '+as'     => [ 'artist_name'  ],
+    })->next;
+  }
+  catch {
+    diag "Could not execute two-step inner join: $_";
+  };
+
+  s/^'//, s/'\z// for @bind;
+
+  is_same_sql_bind(
+    $sql,
+    \@bind,
+    'SELECT [me].[trackid], [me].[cd], [me].[position], [me].[title], [me].[last_updated_on], [me].[last_updated_at], [artist].[name] FROM ( ( [track] [me] INNER JOIN cd [cd] ON [cd].[cdid] = [me].[cd] ) INNER JOIN [artist] [artist] ON [artist].[artistid] = [cd].[artist] ) WHERE ( [trackid] = ? )',
+    [$track->trackid],
+    'correct SQL for two-step inner join',
+  );
+
+  is try { $joined_artist->get_column('artist_name') }, 'foo',
+    'two-step inner join works';
 
 # test basic transactions
   $schema->txn_do(sub {