fix MSSQL on_connect_call => 'use_dynamic_cursors' regression in 1db83fb9

diff --git a/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm
index bedf113..7aff37c 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm
+++ b/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm
@@ -174,27 +174,27 @@ C<SCOPE_IDENTITY()>, and C<SELECT @@IDENTITY> will be used instead, which on SQL
 Server 2005 and later will return erroneous results on tables which have an on
 insert trigger that inserts into another table with an C<IDENTITY> column.
 
+B<WARNING:> on FreeTDS, changes made in one statement (e.g. an insert) may not
+be visible from a following statement (e.g. a select.)
+
 =cut
 
 sub connect_call_use_dynamic_cursors {
   my $self = shift;
 
-  my $conn_info = $self->_dbi_connect_info;
+  if (($self->_dbic_connect_attributes->{odbc_cursortype} || 0) < 2) {
 
-  if (ref($conn_info->[0]) eq 'CODE') {
-    $self->throw_exception ('Cannot set DBI attributes on a CODE ref connect_info');
-  }
+    my $dbi_inf = $self->_dbi_connect_info;
+
+    $self->throw_exception ('Cannot set DBI attributes on a CODE ref connect_info')
+      if ref($dbi_inf->[0]) eq 'CODE';
 
-  if (
-    ref($conn_info->[-1]) ne 'HASH'
-      or
-    ($conn_info->[-1]{odbc_cursortype}||0) < 2
-  ) {
     # reenter connection information with the attribute re-set
-    $self->connect_info(
-      @{$conn_info}[0,1,2],
-      { %{$self->_dbix_connect_attributes}, odbc_cursortype => 2 },
-    );
+    $dbi_inf->[3] = {} if @$dbi_inf <= 3;
+    $dbi_inf->[3]{odbc_cursortype} = 2;
+
+    $self->_dbi_connect_info($dbi_inf);
+
     $self->disconnect; # resetting dbi attrs, so have to reconnect
     $self->ensure_connected;
   }
@@ -296,11 +296,11 @@ sub using_freetds {
 
 =head1 AUTHOR
 
-See L<DBIx::Class/CONTRIBUTORS>.
+See L<DBIx::Class/AUTHOR> and L<DBIx::Class/CONTRIBUTORS>.
 
 =head1 LICENSE
 
 You may distribute this code under the same terms as Perl itself.
 
 =cut
-# vim: sw=2 sts=2
+# vim:sw=2 sts=2 et

diff --git a/t/746mssql.t b/t/746mssql.t
index f559945..ac16bc8 100644 (file)
--- a/t/746mssql.t
+++ b/t/746mssql.t
@@ -51,25 +51,32 @@ lives_ok {
 
 my %opts = (
   use_mars =>
-    { on_connect_call => 'use_mars' },
+    { opts => { on_connect_call => 'use_mars' } },
   use_dynamic_cursors =>
-    { on_connect_call => 'use_dynamic_cursors' },
+    { opts => { on_connect_call => 'use_dynamic_cursors' }, required => 1 },
   use_server_cursors =>
-    { on_connect_call => 'use_server_cursors' },
-  plain =>
-    {},
+    { opts => { on_connect_call => 'use_server_cursors' } },
+  NO_OPTION =>
+    { opts => {}, required => 1 },
 );
 
 for my $opts_name (keys %opts) {
   SKIP: {
-    my $opts = $opts{$opts_name};
+    my $opts = $opts{$opts_name}{opts};
     $schema = DBICTest::Schema->connect($dsn, $user, $pass, $opts);
 
     try {
       $schema->storage->ensure_connected
     }
     catch {
-      skip "$opts_name not functional in this configuration: $_", 1;
+      if ($opts{$opts_name}{required}) {
+        BAIL_OUT "on_connect_call option '$opts_name' is not functional: $_";
+      }
+      else {
+        skip
+"on_connect_call option '$opts_name' not functional in this configuration: $_",
+1;
+      }
     };
 
     $schema->storage->dbh_do (sub {
@@ -522,27 +529,36 @@ CREATE TABLE money_test (
 SQL
       });
 
-      my $rs = $schema->resultset('Money');
-      my $row;
+      TODO: {
+        local $TODO =
+'these tests fail on freetds with dynamic cursors for some reason'
+          if $opts_name eq 'use_dynamic_cursors'
+             && $schema->storage->using_freetds;
 
-      lives_ok {
-        $row = $rs->create({ amount => 100 });
-      } 'inserted a money value';
+        my $rs = $schema->resultset('Money');
+        my $row;
 
-      cmp_ok $rs->find($row->id)->amount, '==', 100, 'money value round-trip';
+        lives_ok {
+          $row = $rs->create({ amount => 100 });
+        } 'inserted a money value';
 
-      lives_ok {
-        $row->update({ amount => 200 });
-      } 'updated a money value';
+        cmp_ok ((try { $rs->find($row->id)->amount })||0, '==', 100,
+          'money value round-trip');
 
-      cmp_ok $rs->find($row->id)->amount, '==', 200,
-        'updated money value round-trip';
+        lives_ok {
+          $row->update({ amount => 200 });
+        } 'updated a money value';
 
-      lives_ok {
-        $row->update({ amount => undef });
-      } 'updated a money value to NULL';
+        cmp_ok ((try { $rs->find($row->id)->amount })||0, '==', 200,
+          'updated money value round-trip');
 
-      is $rs->find($row->id)->amount, undef,'updated money value to NULL round-trip';
+        lives_ok {
+          $row->update({ amount => undef });
+        } 'updated a money value to NULL';
+
+        is try { $rs->find($row->id)->amount }, undef,
+          'updated money value to NULL round-trip';
+      }
     }
   }
 }