tiny_tds 2.1.2 → 2.1.7

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
@@ -215,34 +215,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 +254,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,25 +284,25 @@ 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
@@ -337,7 +337,7 @@ 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
@@ -652,6 +652,48 @@ class ResultTest < TinyTds::TestCase
             assert_equal 1, messages.length, 'there should be one message after one print statement'
             assert_equal msg, m.message, 'message text'
           end
+
+          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 '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
+
+          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 '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_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
+
+          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 not raise an error when severity is 10 or less' do
@@ -684,7 +726,7 @@ class ResultTest < TinyTds::TestCase
       end
 
       it 'throws an error when you execute another query with other results pending' do
-        result1 = @client.execute(@query1)
+        @client.execute(@query1)
         action = lambda { @client.execute(@query1) }
         assert_raise_tinytds_error(action) do |e|
           assert_match %r|with results pending|i, e.message
@@ -717,22 +759,22 @@ class ResultTest < TinyTds::TestCase
       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 ??'
+        _(@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'
+        _(@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
+            _(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
         end
@@ -770,4 +812,3 @@ class ResultTest < TinyTds::TestCase
   end
 
 end
-

data/test/schema_test.rb

@@ -14,7 +14,7 @@ class SchemaTest < TinyTds::TestCase
     describe 'for shared types' do
 
       it 'casts bigint' do
-        assert_equal -9223372036854775807, find_value(11, :bigint)
+        assert_equal (-9223372036854775807), find_value(11, :bigint)
         assert_equal 9223372036854775806, find_value(12, :bigint)
       end
 
@@ -96,7 +96,7 @@ class SchemaTest < TinyTds::TestCase
       end
 
       it 'casts int' do
-        assert_equal -2147483647, find_value(151, :int)
+        assert_equal (-2147483647), find_value(151, :int)
         assert_equal 2147483646, find_value(152, :int)
       end
 
@@ -170,7 +170,7 @@ class SchemaTest < TinyTds::TestCase
       end
 
       it 'casts smallint' do
-        assert_equal -32767, find_value(241, :smallint)
+        assert_equal (-32767), find_value(241, :smallint)
         assert_equal 32766, find_value(242, :smallint)
       end
 
@@ -396,15 +396,15 @@ class SchemaTest < TinyTds::TestCase
         if @client.tds_73?
           assertions = lambda {
             assert_instance_of Time, v
-            assert_equal 1984, v.year,         'Year'
-            assert_equal 1, v.month,           'Month'
-            assert_equal 24, v.day,            'Day'
-            assert_equal 4, v.hour,            'Hour'
-            assert_equal 20, v.min,            'Minute'
-            assert_equal 59, v.sec,            'Second'
-            assert_equal 123456, v.usec,       'Microseconds'
-            assert_equal 123456700, v.nsec,    'Nanoseconds'
-            assert_equal -28800, v.utc_offset, 'Offset'
+            assert_equal 1984, v.year,           'Year'
+            assert_equal 1, v.month,             'Month'
+            assert_equal 24, v.day,              'Day'
+            assert_equal 4, v.hour,              'Hour'
+            assert_equal 20, v.min,              'Minute'
+            assert_equal 59, v.sec,              'Second'
+            assert_equal 123456, v.usec,         'Microseconds'
+            assert_equal 123456700, v.nsec,      'Nanoseconds'
+            assert_equal (-28800), v.utc_offset, 'Offset'
           }
           assertions.call
           v = find_value 84, :datetimeoffset_7, timezone: :local

data/test/sql/db-create.sql

@@ -0,0 +1,18 @@
+:ON ERROR EXIT
+
+PRINT 'RUNNING DB-CREATE.SQL, CREATING TINYTDS TEST DATABASE';
+IF NOT EXISTS(SELECT * FROM sys.databases WHERE name = 'tinytdstest')
+BEGIN
+  CREATE DATABASE [tinytdstest];
+END
+GO
+
+IF EXISTS (SELECT name FROM master.dbo.sysdatabases WHERE name LIKE 'tinytdstest')
+BEGIN
+  PRINT 'TINY TDS TEST DB SUCCESSFULY CREATED';
+END
+ELSE
+BEGIN
+  THROW 51000, 'TINY TDS TEST DB CREATION FAILED', 1;
+END
+GO

data/test/sql/db-login.sql

@@ -0,0 +1,38 @@
+:ON ERROR EXIT
+
+PRINT 'RUNNING DB-LOGIN.SQL';
+
+PRINT 'CREATING TINYTDS TEST LOGIN';
+IF NOT EXISTS (select name from sys.server_principals where name like 'tinytds')
+BEGIN
+  CREATE LOGIN [tinytds] WITH PASSWORD = '', CHECK_POLICY = OFF, DEFAULT_DATABASE = [tinytdstest];
+END
+GO
+
+IF EXISTS (select name from sys.server_principals where name like 'tinytds')
+BEGIN
+  PRINT 'TINY TDS TEST LOGIN SUCCESSFULY CREATED';
+END
+ELSE
+BEGIN
+  THROW 51000, 'TINY TDS TEST LOGIN CREATION FAILED', 1;
+END
+GO
+
+USE [tinytdstest];
+IF NOT EXISTS (select name from sys.database_principals where name LIKE 'tinytds')
+BEGIN
+  CREATE USER [tinytds] FOR LOGIN [tinytds];
+  EXEC sp_addrolemember N'db_owner', N'tinytds';
+END
+GO
+
+IF EXISTS (select name from sys.database_principals where name LIKE 'tinytds')
+BEGIN
+  PRINT 'TINY TDS TEST USER SUCCESSFULY CREATED';
+END
+ELSE
+BEGIN
+  THROW 51000, 'TINY TDS TEST USER CREATION FAILED', 1;
+END
+GO

data/test/test_helper.rb

@@ -2,6 +2,7 @@
 require 'bundler' ; Bundler.require :development, :test
 require 'tiny_tds'
 require 'minitest/autorun'
+require 'toxiproxy'
 
 TINYTDS_SCHEMAS = ['sqlserver_2000', 'sqlserver_2005', 'sqlserver_2008', 'sqlserver_2014', 'sqlserver_azure', 'sybase_ase'].freeze
 
@@ -93,7 +94,7 @@ module TinyTds
     end
 
     def assert_client_works(client)
-      client.execute("SELECT 'client_works' as [client_works]").each.must_equal [{'client_works' => 'client_works'}]
+      _(client.execute("SELECT 'client_works' as [client_works]").each).must_equal [{'client_works' => 'client_works'}]
     end
 
     def assert_new_connections_work
@@ -153,6 +154,8 @@ module TinyTds
       loader.execute(drop_sql).do
       loader.execute(schema_sql).do
       loader.execute(sp_sql).do
+      loader.execute(sp_error_sql).do
+      loader.execute(sp_several_prints_sql).do
       loader.close
       true
     end
@@ -167,7 +170,16 @@ module TinyTds
         ) DROP TABLE datatypes
         IF EXISTS(
           SELECT 1 FROM sysobjects WHERE type = 'P' AND name = 'tinytds_TestReturnCodes'
-        ) DROP PROCEDURE tinytds_TestReturnCodes|
+        ) DROP PROCEDURE tinytds_TestReturnCodes
+        IF EXISTS(
+          SELECT 1 FROM sysobjects WHERE type = 'P' AND name = 'tinytds_TestPrintWithError'
+        ) DROP PROCEDURE tinytds_TestPrintWithError
+        IF EXISTS(
+          SELECT 1 FROM sysobjects WHERE type = 'P' AND name = 'tinytds_TestPrintWithError'
+        ) DROP PROCEDURE tinytds_TestPrintWithError
+        IF EXISTS(
+          SELECT 1 FROM sysobjects WHERE type = 'P' AND name = 'tinytds_TestSeveralPrints'
+        ) DROP PROCEDURE tinytds_TestSeveralPrints|
     end
 
     def drop_sql_microsoft
@@ -181,7 +193,15 @@ module TinyTds
         IF EXISTS (
           SELECT name FROM sysobjects
           WHERE name = 'tinytds_TestReturnCodes' AND type = 'P'
-        ) DROP PROCEDURE tinytds_TestReturnCodes|
+        ) DROP PROCEDURE tinytds_TestReturnCodes
+        IF EXISTS (
+          SELECT name FROM sysobjects
+          WHERE name = 'tinytds_TestPrintWithError' AND type = 'P'
+        ) DROP PROCEDURE tinytds_TestPrintWithError
+        IF EXISTS (
+          SELECT name FROM sysobjects
+          WHERE name = 'tinytds_TestSeveralPrints' AND type = 'P'
+        ) DROP PROCEDURE tinytds_TestSeveralPrints|
     end
 
     def sp_sql
@@ -191,6 +211,21 @@ module TinyTds
         RETURN(420) |
     end
 
+    def sp_error_sql
+      %|CREATE PROCEDURE tinytds_TestPrintWithError
+        AS
+        PRINT 'hello'
+        RAISERROR('Error following print', 16, 1)|
+    end
+
+    def sp_several_prints_sql
+      %|CREATE PROCEDURE tinytds_TestSeveralPrints
+        AS
+        PRINT 'hello 1'
+        PRINT 'hello 2'
+        PRINT 'hello 3'|
+    end
+
     def find_value(id, column, query_options={})
       query_options[:timezone] ||= :utc
       sql = "SELECT [#{column}] FROM [datatypes] WHERE [id] = #{id}"
@@ -212,6 +247,34 @@ module TinyTds
       client.execute("ROLLBACK TRANSACTION").do
     end
 
+    def init_toxiproxy
+      # In order for toxiproxy to work for local docker instances of mssql, the containers must be on the same network
+      # and the host used below must match the mssql container name so toxiproxy knows where to proxy to.
+      # localhost from the perspective of toxiproxy's container is its own container an *not* the mssql container it needs to proxy to.
+      # docker-compose.yml handles this automatically for us. In instances where someone is using their own local mssql container they'll
+      # need to set up the networks manually and set TINYTDS_UNIT_HOST to their mssql container name
+      # For anything other than localhost just use the environment config
+      toxi_host = ENV['TOXIPROXY_HOST'] || 'localhost'
+      toxi_api_port = 8474
+      toxi_test_port = 1234
+      Toxiproxy.host = "http://#{toxi_host}:#{toxi_api_port}"
+
+      toxi_upstream_host = ENV['TINYTDS_UNIT_HOST_TEST'] || ENV['TINYTDS_UNIT_HOST'] || 'localhost'
+      toxi_upstream_port = ENV['TINYTDS_UNIT_PORT'] || 1433
+
+      puts "\n-------------------------"
+      puts "Toxiproxy api listener: #{toxi_host}:#{toxi_api_port}"
+      puts "Toxiproxy unit test listener: #{toxi_host}:#{toxi_test_port}"
+      puts "Toxiproxy upstream sqlserver: #{toxi_upstream_host}:#{toxi_upstream_port}"
+      puts '-------------------------'
+
+      Toxiproxy.populate([
+        {
+          name: "sqlserver_test",
+          listen: "#{toxi_host}:#{toxi_test_port}",
+          upstream: "#{toxi_upstream_host}:#{toxi_upstream_port}"
+        }
+      ])
+    end
   end
 end
-

data/test/thread_test.rb

@@ -49,7 +49,7 @@ class ThreadTest < TinyTds::TestCase
             begin
               result = client.execute "select dbname()"
               result.each { |r| puts r }
-            rescue Exception => e
+            rescue Exception => _e
               # We are throwing an error on purpose here since 0.6.1 would
               # segfault on errors thrown in threads
             end

data/tiny_tds.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
   s.required_ruby_version = '>= 2.0.0'
   s.metadata['msys2_mingw_dependencies'] = 'freetds'
-  s.add_development_dependency 'mini_portile2', '~> 2.0'
-  s.add_development_dependency 'rake', '~> 10.4'
-  s.add_development_dependency 'rake-compiler', '~> 1.0'
-  s.add_development_dependency 'rake-compiler-dock', '~> 0.6.3'
-  s.add_development_dependency 'minitest', '~> 5.6'
-  s.add_development_dependency 'connection_pool', '~> 2.2'
+  s.add_development_dependency 'mini_portile2', '~> 2.5.0'
+  s.add_development_dependency 'rake', '~> 13.0.0'
+  s.add_development_dependency 'rake-compiler', '~> 1.2'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.4.0'
+  s.add_development_dependency 'minitest', '~> 5.14.0'
+  s.add_development_dependency 'minitest-ci', '~> 3.4.0'
+  s.add_development_dependency 'connection_pool', '~> 2.2.0'
+  s.add_development_dependency 'toxiproxy', '~> 2.0.0'
 end