tiny_tds 2.1.2 → 3.0.0

data/test/result_test.rb

@@ -80,7 +80,7 @@ class ResultTest < TinyTds::TestCase
         @client.execute("DELETE FROM [datatypes]").do
         @client.execute("INSERT INTO [datatypes] ([char_10], [varchar_50]) VALUES ('1', '2')").do
         result = @client.execute("SELECT TOP (1) [char_10] + 'test' + [varchar_50] AS [test] FROM [datatypes]").each.first['test']
-        result.must_equal "1         test2"
+        _(result).must_equal "1         test2"
       end
     end
 
@@ -135,10 +135,10 @@ class ResultTest < TinyTds::TestCase
         text = 'test affected rows sql'
         @client.execute("DELETE FROM [datatypes]").do
         afrows = @client.execute("SELECT @@ROWCOUNT AS AffectedRows").each.first['AffectedRows']
-        ['Fixnum', 'Integer'].must_include afrows.class.name
+        _(['Fixnum', 'Integer']).must_include afrows.class.name
         @client.execute("INSERT INTO [datatypes] ([varchar_50]) VALUES ('#{text}')").do
         pk1 = @client.execute(@client.identity_sql).each.first['Ident']
-        ['Fixnum', 'Integer'].must_include pk1.class.name, 'we it be able to CAST to bigint'
+        _(['Fixnum', 'Integer']).must_include pk1.class.name, 'we it be able to CAST to bigint'
         @client.execute("UPDATE [datatypes] SET [varchar_50] = NULL WHERE [varchar_50] = '#{text}'").do
         afrows = @client.execute("SELECT @@ROWCOUNT AS AffectedRows").each.first['AffectedRows']
         assert_equal 1, afrows
@@ -154,7 +154,7 @@ class ResultTest < TinyTds::TestCase
         inserted_rows = @client.execute("INSERT INTO [datatypes] ([varchar_50]) VALUES ('#{text}')").do
         assert_equal 1, inserted_rows, 'should have inserted row for one above'
         updated_rows = @client.execute("UPDATE [datatypes] SET [varchar_50] = NULL WHERE [varchar_50] = '#{text}'").do
-        assert_equal 1, updated_rows, 'should have updated row for one above' unless sqlserver_2000? # Will report -1
+        assert_equal 1, updated_rows, 'should have updated row for one above'
       end
     end
 
@@ -166,7 +166,7 @@ class ResultTest < TinyTds::TestCase
         inserted_rows = @client.execute("INSERT INTO [datatypes] ([varchar_50]) VALUES ('#{text}')").do
         assert_equal 1, inserted_rows, 'should have inserted row for one above'
         updated_rows = @client.execute("UPDATE [datatypes] SET [varchar_50] = NULL WHERE [varchar_50] = '#{text}'").do
-        assert_equal 1, updated_rows, 'should have updated row for one above' unless sqlserver_2000? # Will report -1
+        assert_equal 1, updated_rows, 'should have updated row for one above'
       end
     end
 
@@ -177,19 +177,18 @@ class ResultTest < TinyTds::TestCase
         @client.execute("INSERT INTO [datatypes] ([varchar_50]) VALUES ('#{text}')").do
         sql_identity = @client.execute(@client.identity_sql).each.first['Ident']
         native_identity = @client.execute("INSERT INTO [datatypes] ([varchar_50]) VALUES ('#{text}')").insert
-        assert_equal sql_identity+1, native_identity
+        assert_equal sql_identity + 1, native_identity
       end
     end
 
     it 'returns bigint for #insert when needed' do
       return if sqlserver_azure? # We can not alter clustered index like this test does.
-      return if sybase_ase?      # On Sybase, sp_helpindex cannot be used inside a transaction since it does a
-                                 # 'CREATE TABLE' command is not allowed within a multi-statement transaction
-                                 # and and sp_helpindex creates a temporary table #spindtab.
+      # 'CREATE TABLE' command is not allowed within a multi-statement transaction
+      # and and sp_helpindex creates a temporary table #spindtab.
       rollback_transaction(@client) do
         seed = 9223372036854775805
         @client.execute("DELETE FROM [datatypes]").do
-        id_constraint_name = @client.execute("EXEC sp_helpindex [datatypes]").detect{ |row| row['index_keys'] == 'id' }['index_name']
+        id_constraint_name = @client.execute("EXEC sp_helpindex [datatypes]").detect { |row| row['index_keys'] == 'id' }['index_name']
         @client.execute("ALTER TABLE [datatypes] DROP CONSTRAINT [#{id_constraint_name}]").do
         @client.execute("ALTER TABLE [datatypes] DROP COLUMN [id]").do
         @client.execute("ALTER TABLE [datatypes] ADD [id] [bigint] NOT NULL IDENTITY(1,1) PRIMARY KEY").do
@@ -215,34 +214,34 @@ class ResultTest < TinyTds::TestCase
       @client.execute("DELETE FROM [datatypes]").do
       @client.execute("ROLLBACK TRANSACTION").do
       count = @client.execute("SELECT COUNT(*) AS [count] FROM [datatypes]").each.first['count']
-      0.wont_equal count
+      _(count).wont_equal 0
     end
 
     it 'has a #fields accessor with logic default and valid outcome' do
       result = @client.execute(@query1)
-      result.fields.must_equal ['one']
+      _(result.fields).must_equal ['one']
       result.each
-      result.fields.must_equal ['one']
+      _(result.fields).must_equal ['one']
     end
 
     it 'always returns an array for fields for all sql' do
       result = @client.execute("USE [tinytdstest]")
-      result.fields.must_equal []
+      _(result.fields).must_equal []
       result.do
-      result.fields.must_equal []
+      _(result.fields).must_equal []
     end
 
     it 'returns fields even when no results are found' do
       no_results_query = "SELECT [id], [varchar_50] FROM [datatypes] WHERE [varchar_50] = 'NOTFOUND'"
       # Fields before each.
       result = @client.execute(no_results_query)
-      result.fields.must_equal ['id','varchar_50']
+      _(result.fields).must_equal ['id', 'varchar_50']
       result.each
-      result.fields.must_equal ['id','varchar_50']
+      _(result.fields).must_equal ['id', 'varchar_50']
       # Each then fields
       result = @client.execute(no_results_query)
       result.each
-      result.fields.must_equal ['id','varchar_50']
+      _(result.fields).must_equal ['id', 'varchar_50']
     end
 
     it 'allows the result to be canceled before reading' do
@@ -254,27 +253,27 @@ class ResultTest < TinyTds::TestCase
     it 'works in tandem with the client when needing to find out if client has sql sent and result is canceled or not' do
       # Default state.
       @client = TinyTds::Client.new(connection_options)
-      @client.sqlsent?.must_equal false
-      @client.canceled?.must_equal false
+      _(@client.sqlsent?).must_equal false
+      _(@client.canceled?).must_equal false
       # With active result before and after cancel.
       result = @client.execute(@query1)
-      @client.sqlsent?.must_equal true
-      @client.canceled?.must_equal false
+      _(@client.sqlsent?).must_equal true
+      _(@client.canceled?).must_equal false
       result.cancel
-      @client.sqlsent?.must_equal false
-      @client.canceled?.must_equal true
+      _(@client.sqlsent?).must_equal false
+      _(@client.canceled?).must_equal true
       assert result.cancel, 'must be safe to call again'
       # With each and no block.
       @client.execute(@query1).each
-      @client.sqlsent?.must_equal false
-      @client.canceled?.must_equal false
+      _(@client.sqlsent?).must_equal false
+      _(@client.canceled?).must_equal false
       # With each and block.
       @client.execute(@query1).each do |row|
-        @client.sqlsent?.must_equal true, 'when iterating over each row in a block'
-        @client.canceled?.must_equal false
+        _(@client.sqlsent?).must_equal true, 'when iterating over each row in a block'
+        _(@client.canceled?).must_equal false
       end
-      @client.sqlsent?.must_equal false
-      @client.canceled?.must_equal false
+      _(@client.sqlsent?).must_equal false
+      _(@client.canceled?).must_equal false
       # With each and block canceled half way thru.
       count = @client.execute("SELECT COUNT([id]) AS [count] FROM [datatypes]").each[0]['count']
       assert count > 10, 'since we want to cancel early for test'
@@ -284,30 +283,30 @@ class ResultTest < TinyTds::TestCase
         break if index > 10
         index += 1
       end
-      @client.sqlsent?.must_equal true
-      @client.canceled?.must_equal false
+      _(@client.sqlsent?).must_equal true
+      _(@client.canceled?).must_equal false
       result.cancel
-      @client.sqlsent?.must_equal false
-      @client.canceled?.must_equal true
+      _(@client.sqlsent?).must_equal false
+      _(@client.canceled?).must_equal true
       # With do method.
       @client.execute(@query1).do
-      @client.sqlsent?.must_equal false
-      @client.canceled?.must_equal true
+      _(@client.sqlsent?).must_equal false
+      _(@client.canceled?).must_equal true
       # With insert method.
       rollback_transaction(@client) do
         @client.execute("INSERT INTO [datatypes] ([varchar_50]) VALUES ('test')").insert
-        @client.sqlsent?.must_equal false
-        @client.canceled?.must_equal true
+        _(@client.sqlsent?).must_equal false
+        _(@client.canceled?).must_equal true
       end
       # With first
       @client.execute("SELECT [id] FROM [datatypes]").each(:first => true)
-      @client.sqlsent?.must_equal false
-      @client.canceled?.must_equal true
+      _(@client.sqlsent?).must_equal false
+      _(@client.canceled?).must_equal true
     end
 
     it 'use same string object for hash keys' do
       data = @client.execute("SELECT [id], [bigint] FROM [datatypes]").each
-      assert_equal data.first.keys.map{ |r| r.object_id }, data.last.keys.map{ |r| r.object_id }
+      assert_equal data.first.keys.map { |r| r.object_id }, data.last.keys.map { |r| r.object_id }
     end
 
     it 'has properly encoded column names with symbol keys' do
@@ -326,7 +325,7 @@ class ResultTest < TinyTds::TestCase
     it 'allows #return_code to work with stored procedures and reset per sql batch' do
       assert_nil @client.return_code
       result = @client.execute("EXEC tinytds_TestReturnCodes")
-      assert_equal [{"one"=>1}], result.each
+      assert_equal [{ "one" => 1 }], result.each
       assert_equal 420, @client.return_code
       assert_equal 420, result.return_code
       result = @client.execute('SELECT 1 as [one]')
@@ -337,13 +336,13 @@ class ResultTest < TinyTds::TestCase
 
     it 'with LOGINPROPERTY function' do
       v = @client.execute("SELECT LOGINPROPERTY('sa', 'IsLocked') as v").first['v']
-      v.must_equal 0
+      _(v).must_equal 0
     end
 
     describe 'with multiple result sets' do
 
       before do
-        @empty_select  = "SELECT 1 AS [rs1] WHERE 1 = 0"
+        @empty_select = "SELECT 1 AS [rs1] WHERE 1 = 0"
         @double_select = "SELECT 1 AS [rs1]
                           SELECT 2 AS [rs2]"
         @triple_select_1st_empty = "SELECT 1 AS [rs1] WHERE 1 = 0
@@ -361,8 +360,8 @@ class ResultTest < TinyTds::TestCase
         result = @client.execute(@double_select)
         result_sets = result.each
         assert_equal 2, result_sets.size
-        assert_equal [{'rs1' => 1}], result_sets.first
-        assert_equal [{'rs2' => 2}], result_sets.last
+        assert_equal [{ 'rs1' => 1 }], result_sets.first
+        assert_equal [{ 'rs2' => 2 }], result_sets.last
         assert_equal [['rs1'], ['rs2']], result.fields
         assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
         # As array
@@ -383,20 +382,12 @@ class ResultTest < TinyTds::TestCase
       end
 
       it 'works from a stored procedure' do
-        if sqlserver?
-          results1, results2 = @client.execute("EXEC sp_helpconstraint '[datatypes]'").each
-          assert_equal [{"Object Name"=>"[datatypes]"}], results1
-          constraint_info = results2.first
-          assert constraint_info.key?("constraint_keys")
-          assert constraint_info.key?("constraint_type")
-          assert constraint_info.key?("constraint_name")
-        elsif sybase_ase?
-          results1, results2 = @client.execute("EXEC sp_helpconstraint 'datatypes'").each
-          assert results1['name']      =~ /^datatypes_bit/
-          assert results1['defintion'] == 'DEFAULT  0'
-          assert results2['name']      =~ /^datatypes_id/
-          assert results2['defintion'] =~ /^PRIMARY KEY/
-        end
+        results1, results2 = @client.execute("EXEC sp_helpconstraint '[datatypes]'").each
+        assert_equal [{ "Object Name" => "[datatypes]" }], results1
+        constraint_info = results2.first
+        assert constraint_info.key?("constraint_keys")
+        assert constraint_info.key?("constraint_type")
+        assert constraint_info.key?("constraint_name")
       end
 
       describe 'using :empty_sets TRUE' do
@@ -423,8 +414,8 @@ class ResultTest < TinyTds::TestCase
           result_sets = result.each
           assert_equal 3, result_sets.size
           assert_equal [], result_sets[0]
-          assert_equal [{'rs2' => 2}], result_sets[1]
-          assert_equal [{'rs3' => 3}], result_sets[2]
+          assert_equal [{ 'rs2' => 2 }], result_sets[1]
+          assert_equal [{ 'rs3' => 3 }], result_sets[2]
           assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
           # As array
@@ -442,9 +433,9 @@ class ResultTest < TinyTds::TestCase
           result = @client.execute(@triple_select_2nd_empty)
           result_sets = result.each
           assert_equal 3, result_sets.size
-          assert_equal [{'rs1' => 1}], result_sets[0]
+          assert_equal [{ 'rs1' => 1 }], result_sets[0]
           assert_equal [], result_sets[1]
-          assert_equal [{'rs3' => 3}], result_sets[2]
+          assert_equal [{ 'rs3' => 3 }], result_sets[2]
           assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
           # As array
@@ -462,8 +453,8 @@ class ResultTest < TinyTds::TestCase
           result = @client.execute(@triple_select_3rd_empty)
           result_sets = result.each
           assert_equal 3, result_sets.size
-          assert_equal [{'rs1' => 1}], result_sets[0]
-          assert_equal [{'rs2' => 2}], result_sets[1]
+          assert_equal [{ 'rs1' => 1 }], result_sets[0]
+          assert_equal [{ 'rs2' => 2 }], result_sets[1]
           assert_equal [], result_sets[2]
           assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
@@ -503,8 +494,8 @@ class ResultTest < TinyTds::TestCase
           result = @client.execute(@triple_select_1st_empty)
           result_sets = result.each
           assert_equal 2, result_sets.size
-          assert_equal [{'rs2' => 2}], result_sets[0]
-          assert_equal [{'rs3' => 3}], result_sets[1]
+          assert_equal [{ 'rs2' => 2 }], result_sets[0]
+          assert_equal [{ 'rs3' => 3 }], result_sets[1]
           assert_equal [['rs2'], ['rs3']], result.fields
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
           # As array
@@ -521,8 +512,8 @@ class ResultTest < TinyTds::TestCase
           result = @client.execute(@triple_select_2nd_empty)
           result_sets = result.each
           assert_equal 2, result_sets.size
-          assert_equal [{'rs1' => 1}], result_sets[0]
-          assert_equal [{'rs3' => 3}], result_sets[1]
+          assert_equal [{ 'rs1' => 1 }], result_sets[0]
+          assert_equal [{ 'rs3' => 3 }], result_sets[1]
           assert_equal [['rs1'], ['rs3']], result.fields
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
           # As array
@@ -539,8 +530,8 @@ class ResultTest < TinyTds::TestCase
           result = @client.execute(@triple_select_3rd_empty)
           result_sets = result.each
           assert_equal 2, result_sets.size
-          assert_equal [{'rs1' => 1}], result_sets[0]
-          assert_equal [{'rs2' => 2}], result_sets[1]
+          assert_equal [{ 'rs1' => 1 }], result_sets[0]
+          assert_equal [{ 'rs2' => 2 }], result_sets[1]
           assert_equal [['rs1'], ['rs2']], result.fields
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
           # As array
@@ -590,7 +581,7 @@ class ResultTest < TinyTds::TestCase
         before do
           @big_text = 'x' * 2_000_000
           @old_textsize = @client.execute("SELECT @@TEXTSIZE AS [textsize]").each.first['textsize'].inspect
-          @client.execute("SET TEXTSIZE #{(@big_text.length*2)+1}").do
+          @client.execute("SET TEXTSIZE #{(@big_text.length * 2) + 1}").do
         end
 
         it 'must insert and select large varchar_max' do
@@ -601,7 +592,7 @@ class ResultTest < TinyTds::TestCase
           insert_and_select_datatype :nvarchar_max
         end
 
-      end unless sqlserver_2000? || sybase_ase?
+      end
 
     end
 
@@ -612,147 +603,105 @@ class ResultTest < TinyTds::TestCase
         assert_equal [], @client.execute('').each
       end
 
-      if sqlserver?
-
-        describe 'using :message_handler option' do
-          let(:messages) { Array.new }
+      describe 'using :message_handler option' do
+        let(:messages) { Array.new }
 
-          before do
-            close_client
-            @client = new_connection message_handler: Proc.new { |m| messages << m }
-          end
-
-          after do
-            messages.clear
-          end
+        before do
+          close_client
+          @client = new_connection message_handler: Proc.new { |m| messages << m }
+        end
 
-          it 'has a message handler that responds to call' do
-            assert @client.message_handler.respond_to?(:call)
-          end
+        after do
+          messages.clear
+        end
 
-          it 'calls the provided message handler when severity is 10 or less' do
-            (1..10).to_a.each do |severity|
-              messages.clear
-              msg = "Test #{severity} severity"
-              state = rand(1..255)
-              @client.execute("RAISERROR(N'#{msg}', #{severity}, #{state})").do
-              m = messages.first
-              assert_equal 1, messages.length, 'there should be one message after one raiserror'
-              assert_equal msg, m.message, 'message text'
-              assert_equal severity, m.severity, 'message severity' unless severity == 10 && m.severity.to_i == 0
-              assert_equal state, m.os_error_number, 'message state'
-            end
-          end
+        it 'has a message handler that responds to call' do
+          assert @client.message_handler.respond_to?(:call)
+        end
 
-          it 'calls the provided message handler for `print` messages' do
+        it 'calls the provided message handler when severity is 10 or less' do
+          (1..10).to_a.each do |severity|
             messages.clear
-            msg = 'hello'
-            @client.execute("PRINT '#{msg}'").do
+            msg = "Test #{severity} severity"
+            state = rand(1..255)
+            @client.execute("RAISERROR(N'#{msg}', #{severity}, #{state})").do
             m = messages.first
-            assert_equal 1, messages.length, 'there should be one message after one print statement'
+            assert_equal 1, messages.length, 'there should be one message after one raiserror'
             assert_equal msg, m.message, 'message text'
+            assert_equal severity, m.severity, 'message severity' unless severity == 10 && m.severity.to_i == 0
+            assert_equal state, m.os_error_number, 'message state'
           end
         end
 
-        it 'must not raise an error when severity is 10 or less' do
-          (1..10).to_a.each do |severity|
-            @client.execute("RAISERROR(N'Test #{severity} severity', #{severity}, 1)").do
-          end
+        it 'calls the provided message handler for `print` messages' do
+          messages.clear
+          msg = 'hello'
+          @client.execute("PRINT '#{msg}'").do
+          m = messages.first
+          assert_equal 1, messages.length, 'there should be one message after one print statement'
+          assert_equal msg, m.message, 'message text'
         end
 
-        it 'raises an error when severity is greater than 10' do
-          action = lambda { @client.execute("RAISERROR(N'Test 11 severity', 11, 1)").do }
+        it 'must raise an error preceded by a `print` message' do
+          messages.clear
+          action = lambda { @client.execute("EXEC tinytds_TestPrintWithError").do }
           assert_raise_tinytds_error(action) do |e|
-            assert_equal "Test 11 severity", e.message
-            assert_equal 11, e.severity
+            assert_equal 'hello', messages.first.message, 'message text'
+
+            assert_equal "Error following print", e.message
+            assert_equal 16, e.severity
             assert_equal 50000, e.db_error_number
           end
         end
 
-      else
+        it 'calls the provided message handler for each of a series of `print` messages' do
+          messages.clear
+          @client.execute("EXEC tinytds_TestSeveralPrints").do
+          assert_equal ['hello 1', 'hello 2', 'hello 3'], messages.map { |e| e.message }, 'message list'
+        end
 
-        it 'raises an error' do
-          action = lambda { @client.execute("RAISERROR 50000 N'Hello World'").do }
+        it 'should flush info messages before raising error in cases of timeout' do
+          @client = new_connection timeout: 1, message_handler: Proc.new { |m| messages << m }
+          action = lambda { @client.execute("print 'hello'; waitfor delay '00:00:02'").do }
+          messages.clear
           assert_raise_tinytds_error(action) do |e|
-            assert_equal "Hello World", e.message
-            assert_equal 16, e.severity # predefined on ASE
-            assert_equal 50000, e.db_error_number
+            assert_match %r{timed out}i, e.message, 'ignore if non-english test run'
+            assert_equal 6, e.severity
+            assert_equal 20003, e.db_error_number
+            assert_equal 'hello', messages.first&.message, 'message text'
           end
-          assert_followup_query
         end
 
-      end
-
-      it 'throws an error when you execute another query with other results pending' do
-        result1 = @client.execute(@query1)
-        action = lambda { @client.execute(@query1) }
-        assert_raise_tinytds_error(action) do |e|
-          assert_match %r|with results pending|i, e.message
-          assert_equal 7, e.severity
-          assert_equal 20019, e.db_error_number
+        it 'should print info messages before raising error in cases of timeout' do
+          @client = new_connection timeout: 1, message_handler: Proc.new { |m| messages << m }
+          action = lambda { @client.execute("raiserror('hello', 1, 1) with nowait; waitfor delay '00:00:02'").do }
+          messages.clear
+          assert_raise_tinytds_error(action) do |e|
+            assert_match %r{timed out}i, e.message, 'ignore if non-english test run'
+            assert_equal 6, e.severity
+            assert_equal 20003, e.db_error_number
+            assert_equal 'hello', messages.first&.message, 'message text'
+          end
         end
       end
 
-      it 'must error gracefully with bad table name' do
-        action = lambda { @client.execute('SELECT * FROM [foobar]').each }
-        assert_raise_tinytds_error(action) do |e|
-          pattern = sybase_ase? ? /foobar not found/ : %r|invalid object name.*foobar|i
-          assert_match pattern, e.message
-          assert_equal 16, e.severity
-          assert_equal 208, e.db_error_number
+      it 'must not raise an error when severity is 10 or less' do
+        (1..10).to_a.each do |severity|
+          @client.execute("RAISERROR(N'Test #{severity} severity', #{severity}, 1)").do
         end
-        assert_followup_query
       end
 
-      it 'must error gracefully with incorrect syntax' do
-        action = lambda { @client.execute('this will not work').each }
+      it 'raises an error when severity is greater than 10' do
+        action = lambda { @client.execute("RAISERROR(N'Test 11 severity', 11, 1)").do }
         assert_raise_tinytds_error(action) do |e|
-          assert_match %r|incorrect syntax|i, e.message
-          assert_equal 15, e.severity
-          assert_equal 156, e.db_error_number
-        end
-        assert_followup_query
-      end
-
-      it 'must not error at all from reading non-convertable charcters and just use ? marks' do
-        close_client
-        @client = new_connection :encoding => 'ASCII'
-        @client.charset.must_equal 'ASCII'
-        find_value(202, :nvarchar_50).must_equal 'test nvarchar_50 ??'
-      end
-
-      it 'must error gracefully from writing non-convertable characters' do
-        close_client
-        @client = new_connection :encoding => 'ASCII'
-        @client.charset.must_equal 'ASCII'
-        rollback_transaction(@client) do
-          text = 'Test ✓'
-          @client.execute("DELETE FROM [datatypes] WHERE [nvarchar_50] IS NOT NULL").do
-          action = lambda { @client.execute("INSERT INTO [datatypes] ([nvarchar_50]) VALUES ('#{text}')").do }
-          assert_raise_tinytds_error(action) do |e|
-            e.message.must_match %r{Unclosed quotation mark}i
-            e.severity.must_equal 15
-            e.db_error_number.must_equal 105
-          end
-          assert_followup_query
+          assert_equal "Test 11 severity", e.message
+          assert_equal 11, e.severity
+          assert_equal 50000, e.db_error_number
         end
       end
-
-      it 'errors gracefully with incorrect syntax in sp_executesql' do
-        action = lambda { @client.execute("EXEC sp_executesql N'this will not work'").each }
-        assert_raise_tinytds_error(action) do |e|
-          assert_match %r|incorrect syntax|i, e.message
-          assert_equal 15, e.severity
-          assert_equal 156, e.db_error_number
-        end
-        assert_followup_query
-      end unless sybase_ase?
-
     end
-
   end
 
-
   protected
 
   def assert_followup_query
@@ -770,4 +719,3 @@ class ResultTest < TinyTds::TestCase
   end
 
 end
-