activerecord-sqlserver-adapter 5.2.0 → 5.2.1

data/test/cases/connection_test_sqlserver.rb

@@ -36,7 +36,7 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
   describe 'Connection management' do
 
     it 'set spid on connect' do
-      ['Fixnum', 'Integer'].must_include connection.spid.class.name
+      _(['Fixnum', 'Integer']).must_include connection.spid.class.name
     end
 
     it 'reset spid on disconnect!' do
@@ -46,7 +46,7 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
 
     it 'reset the connection' do
       connection.disconnect!
-      connection.raw_connection.must_be_nil
+      _(connection.raw_connection).must_be_nil
     end
 
     it 'be able to disconnect and reconnect at will' do

data/test/cases/fetch_test_sqlserver.rb

@@ -36,11 +36,11 @@ class FetchTestSqlserver < ActiveRecord::TestCase
 
     it 'gauntlet' do
       Book.where(name:'Name-10').delete_all
-      Book.order(:name).limit(1).offset(1).map(&:name).must_equal ['Name-2']
-      Book.order(:name).limit(2).offset(2).map(&:name).must_equal ['Name-3', 'Name-4']
-      Book.order(:name).limit(2).offset(7).map(&:name).must_equal ['Name-8', 'Name-9']
-      Book.order(:name).limit(3).offset(7).map(&:name).must_equal ['Name-8', 'Name-9']
-      Book.order(:name).limit(3).offset(9).map(&:name).must_equal []
+      _(Book.order(:name).limit(1).offset(1).map(&:name)).must_equal ['Name-2']
+      _(Book.order(:name).limit(2).offset(2).map(&:name)).must_equal ['Name-3', 'Name-4']
+      _(Book.order(:name).limit(2).offset(7).map(&:name)).must_equal ['Name-8', 'Name-9']
+      _(Book.order(:name).limit(3).offset(7).map(&:name)).must_equal ['Name-8', 'Name-9']
+      _(Book.order(:name).limit(3).offset(9).map(&:name)).must_equal []
     end
 
   end

data/test/cases/helper_sqlserver.rb

@@ -25,6 +25,7 @@ module ActiveRecord
     let(:logger) { ActiveRecord::Base.logger }
 
     setup :ensure_clean_rails_env
+    setup :remove_backtrace_silencers
 
     private
 
@@ -32,6 +33,10 @@ module ActiveRecord
       Rails.instance_variable_set(:@_env, nil) if defined?(::Rails)
     end
 
+    def remove_backtrace_silencers
+      Rails.backtrace_cleaner.remove_silencers!
+    end
+
     def host_windows?
       RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end

data/test/cases/json_test_sqlserver.rb

@@ -12,20 +12,20 @@ class JsonTestSQLServer < ActiveRecord::TestCase
   end
 
   it 'can return and save JSON data' do
-    SSTestDatatypeMigrationJson.find(@o1.id).json_col.must_equal({ 'a' => 'a', 'b' => 'b', 'c' => 'c' })
+    _(SSTestDatatypeMigrationJson.find(@o1.id).json_col).must_equal({ 'a' => 'a', 'b' => 'b', 'c' => 'c' })
     @o1.json_col = { 'a' => 'a' }
-    @o1.json_col.must_equal({ 'a' => 'a' })
+    _(@o1.json_col).must_equal({ 'a' => 'a' })
     @o1.save!
-    @o1.reload.json_col.must_equal({ 'a' => 'a' })
+    _(@o1.reload.json_col).must_equal({ 'a' => 'a' })
   end
 
   it 'can use ISJSON function' do
-    SSTestDatatypeMigrationJson.where('ISJSON(json_col) > 0').count.must_equal 4
-    SSTestDatatypeMigrationJson.where('ISJSON(json_col) IS NULL').count.must_equal 1
+    _(SSTestDatatypeMigrationJson.where('ISJSON(json_col) > 0').count).must_equal 4
+    _(SSTestDatatypeMigrationJson.where('ISJSON(json_col) IS NULL').count).must_equal 1
   end
 
   it 'can use JSON_VALUE function' do
-    SSTestDatatypeMigrationJson.where("JSON_VALUE(json_col, '$.b') = 'b'").count.must_equal 2
+    _(SSTestDatatypeMigrationJson.where("JSON_VALUE(json_col, '$.b') = 'b'").count).must_equal 2
   end
 
 end

data/test/cases/migration_test_sqlserver.rb

@@ -24,8 +24,8 @@ class MigrationTestSQLServer < ActiveRecord::TestCase
       rescue Exception => e
         assert_match %r|this and all later migrations canceled|, e.message
       end
-      connection.tables.wont_include @trans_test_table1
-      connection.tables.wont_include @trans_test_table2
+      _(connection.tables).wont_include @trans_test_table1
+      _(connection.tables).wont_include @trans_test_table2
     end
 
   end
@@ -57,6 +57,14 @@ class MigrationTestSQLServer < ActiveRecord::TestCase
       assert default_after
       assert_equal default_before['constraint_keys'], default_after['constraint_keys']
     end
+    
+    it 'change limit' do
+      assert_nothing_raised { connection.change_column :people, :lock_version, :integer, limit: 8 }
+    end
+    
+    it 'change null and default' do
+      assert_nothing_raised { connection.change_column :people, :first_name, :text, null: true, default: nil }
+    end
 
   end
 

data/test/cases/pessimistic_locking_test_sqlserver.rb

@@ -13,7 +13,7 @@ class PessimisticLockingTestSQLServer < ActiveRecord::TestCase
 
   it 'uses with updlock by default' do
     assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(UPDLOCK\)| do
-      Person.lock(true).to_a.must_equal Person.all.to_a
+      _(Person.lock(true).to_a).must_equal Person.all.to_a
     end
   end
 
@@ -22,7 +22,7 @@ class PessimisticLockingTestSQLServer < ActiveRecord::TestCase
     it 'lock with simple find' do
       assert_nothing_raised do
         Person.transaction do
-          Person.lock(true).find(1).must_equal Person.find(1)
+          _(Person.lock(true).find(1)).must_equal Person.find(1)
         end
       end
     end
@@ -31,7 +31,7 @@ class PessimisticLockingTestSQLServer < ActiveRecord::TestCase
       assert_nothing_raised do
         Person.transaction do
           Person.lock(true).scoping do
-            Person.find(1).must_equal Person.find(1)
+            _(Person.find(1)).must_equal Person.find(1)
           end
         end
       end
@@ -41,7 +41,7 @@ class PessimisticLockingTestSQLServer < ActiveRecord::TestCase
        assert_nothing_raised do
         Person.transaction do
           person = Person.lock(true).includes(:readers).find(1)
-          person.must_equal Person.find(1)
+          _(person).must_equal Person.find(1)
         end
       end
     end
@@ -94,11 +94,11 @@ class PessimisticLockingTestSQLServer < ActiveRecord::TestCase
       loader_sql = /SELECT.*FROM \[people\] WITH\(UPDLOCK\).*WHERE \[people\]\.\[id\] IN/
       assert_sql(eager_ids_sql, loader_sql) do
         people = Person.lock(true).limit(5).offset(10).includes(:readers).references(:readers).to_a
-        people[0].first_name.must_equal 'Thing_10'
-        people[1].first_name.must_equal 'Thing_11'
-        people[2].first_name.must_equal 'Thing_12'
-        people[3].first_name.must_equal 'Thing_13'
-        people[4].first_name.must_equal 'Thing_14'
+        _(people[0].first_name).must_equal 'Thing_10'
+        _(people[1].first_name).must_equal 'Thing_11'
+        _(people[2].first_name).must_equal 'Thing_12'
+        _(people[3].first_name).must_equal 'Thing_13'
+        _(people[4].first_name).must_equal 'Thing_14'
       end
     end
 

data/test/cases/rake_test_sqlserver.rb

@@ -43,23 +43,23 @@ class SQLServerRakeCreateTest < SQLServerRakeTest
 
   it 'establishes connection to database after create ' do
     quietly { db_tasks.create configuration }
-    connection.current_database.must_equal(new_database)
+    _(connection.current_database).must_equal(new_database)
   end
 
   it 'creates database with default collation' do
     quietly { db_tasks.create configuration }
-    connection.collation.must_equal 'SQL_Latin1_General_CP1_CI_AS'
+    _(connection.collation).must_equal 'SQL_Latin1_General_CP1_CI_AS'
   end
 
   it 'creates database with given collation' do
     quietly { db_tasks.create configuration.merge('collation' => 'Latin1_General_CI_AS') }
-    connection.collation.must_equal 'Latin1_General_CI_AS'
+    _(connection.collation).must_equal 'Latin1_General_CI_AS'
   end
 
   it 'prints error message when database exists' do
     quietly { db_tasks.create configuration }
     message = capture(:stderr) { db_tasks.create configuration }
-    message.must_match %r{activerecord_unittest_tasks.*already exists}
+    _(message).must_match %r{activerecord_unittest_tasks.*already exists}
   end
 
 end
@@ -73,12 +73,12 @@ class SQLServerRakeDropTest < SQLServerRakeTest
       db_tasks.create configuration
       db_tasks.drop configuration
     end
-    connection.current_database.must_equal 'master'
+    _(connection.current_database).must_equal 'master'
   end
 
   it 'prints error message when database does not exist' do
     message = capture(:stderr) { db_tasks.drop configuration.merge('database' => 'doesnotexist') }
-    message.must_match %r{'doesnotexist' does not exist}
+    _(message).must_match %r{'doesnotexist' does not exist}
   end
 
 end
@@ -94,11 +94,11 @@ class SQLServerRakePurgeTest < SQLServerRakeTest
   end
 
   it 'clears active connections, drops database, and recreates with established connection' do
-    connection.current_database.must_equal(new_database)
-    connection.tables.must_include 'users'
+    _(connection.current_database).must_equal(new_database)
+    _(connection.tables).must_include 'users'
     quietly { db_tasks.purge(configuration) }
-    connection.current_database.must_equal(new_database)
-    connection.tables.wont_include 'users'
+    _(connection.current_database).must_equal(new_database)
+    _(connection.tables).wont_include 'users'
   end
 
 end
@@ -110,7 +110,7 @@ class SQLServerRakeCharsetTest < SQLServerRakeTest
   end
 
   it 'retrieves charset' do
-    db_tasks.charset(configuration).must_equal 'iso_1'
+    _(db_tasks.charset(configuration)).must_equal 'iso_1'
   end
 
 end
@@ -122,7 +122,7 @@ class SQLServerRakeCollationTest < SQLServerRakeTest
   end
 
   it 'retrieves collation' do
-    db_tasks.collation(configuration).must_equal 'SQL_Latin1_General_CP1_CI_AS'
+    _(db_tasks.collation(configuration)).must_equal 'SQL_Latin1_General_CP1_CI_AS'
   end
 
 end
@@ -149,21 +149,21 @@ class SQLServerRakeStructureDumpLoadTest < SQLServerRakeTest
   it 'dumps structure and accounts for defncopy oddities' do
     skip 'debug defncopy on windows later' if host_windows?
     quietly { db_tasks.structure_dump configuration, filename }
-    filedata.wont_match %r{\AUSE.*\z}
-    filedata.wont_match %r{\AGO.*\z}
-    filedata.must_match %r{email\s+nvarchar\(4000\)}
-    filedata.must_match %r{background1\s+nvarchar\(max\)}
-    filedata.must_match %r{background2\s+text\s+}
+    _(filedata).wont_match %r{\AUSE.*\z}
+    _(filedata).wont_match %r{\AGO.*\z}
+    _(filedata).must_match %r{email\s+nvarchar\(4000\)}
+    _(filedata).must_match %r{background1\s+nvarchar\(max\)}
+    _(filedata).must_match %r{background2\s+text\s+}
   end
 
   it 'can load dumped structure' do
     skip 'debug defncopy on windows later' if host_windows?
     quietly { db_tasks.structure_dump configuration, filename }
-    filedata.must_match %r{CREATE TABLE dbo\.users}
+    _(filedata).must_match %r{CREATE TABLE dbo\.users}
     db_tasks.purge(configuration)
-    connection.tables.wont_include 'users'
+    _(connection.tables).wont_include 'users'
     db_tasks.load_schema configuration, :sql, filename
-    connection.tables.must_include 'users'
+    _(connection.tables).must_include 'users'
   end
 
 end

data/test/cases/schema_dumper_test_sqlserver.rb

@@ -34,6 +34,7 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     if connection_dblib_73?
     assert_line :time_7,            type: 'time',         limit: nil,           precision: 7,     scale: nil,  default: "04:20:00.2883215"
     assert_line :time_2,            type: 'time',         limit: nil,           precision: 2,     scale: nil,  default: nil
+    assert_line :time_default,      type: 'time',         limit: nil,           precision: 7,     scale: nil,  default: "15:03:42.0621978"
     end
     # Character Strings
     assert_line :char_10,           type: 'char',         limit: 10,            precision: nil,   scale: nil,  default: "1234567890",           collation: nil
@@ -58,18 +59,18 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     columns = SSTestDatatypeMigration.columns_hash
     generate_schema_for_table 'sst_datatypes_migration'
     # Simple Rails conventions
-    columns['integer_col'].sql_type.must_equal      'int(4)'
-    columns['bigint_col'].sql_type.must_equal       'bigint(8)'
-    columns['boolean_col'].sql_type.must_equal      'bit'
-    columns['decimal_col'].sql_type.must_equal      'decimal(18,0)'
-    columns['float_col'].sql_type.must_equal        'float'
-    columns['string_col'].sql_type.must_equal       'nvarchar(4000)'
-    columns['text_col'].sql_type.must_equal         'nvarchar(max)'
-    columns['datetime_col'].sql_type.must_equal     'datetime'
-    columns['timestamp_col'].sql_type.must_equal    'datetime'
-    columns['time_col'].sql_type.must_equal         'time(7)'
-    columns['date_col'].sql_type.must_equal         'date'
-    columns['binary_col'].sql_type.must_equal       'varbinary(max)'
+    _(columns['integer_col'].sql_type).must_equal      'int(4)'
+    _(columns['bigint_col'].sql_type).must_equal       'bigint(8)'
+    _(columns['boolean_col'].sql_type).must_equal      'bit'
+    _(columns['decimal_col'].sql_type).must_equal      'decimal(18,0)'
+    _(columns['float_col'].sql_type).must_equal        'float'
+    _(columns['string_col'].sql_type).must_equal       'nvarchar(4000)'
+    _(columns['text_col'].sql_type).must_equal         'nvarchar(max)'
+    _(columns['datetime_col'].sql_type).must_equal     'datetime'
+    _(columns['timestamp_col'].sql_type).must_equal    'datetime'
+    _(columns['time_col'].sql_type).must_equal         'time(7)'
+    _(columns['date_col'].sql_type).must_equal         'date'
+    _(columns['binary_col'].sql_type).must_equal       'varbinary(max)'
     assert_line :integer_col,     type: 'integer',      limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :bigint_col,      type: 'bigint',       limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :boolean_col,     type: 'boolean',      limit: nil,          precision: nil,  scale: nil, default: nil
@@ -83,22 +84,22 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :date_col,        type: 'date',         limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :binary_col,      type: 'binary',       limit: nil,          precision: nil,  scale: nil, default: nil
     # Our type methods.
-    columns['real_col'].sql_type.must_equal         'real'
-    columns['money_col'].sql_type.must_equal        'money'
-    columns['smalldatetime_col'].sql_type.must_equal 'smalldatetime'
-    columns['datetime2_col'].sql_type.must_equal    'datetime2(7)'
-    columns['datetimeoffset'].sql_type.must_equal   'datetimeoffset(7)'
-    columns['smallmoney_col'].sql_type.must_equal   'smallmoney'
-    columns['char_col'].sql_type.must_equal         'char(1)'
-    columns['varchar_col'].sql_type.must_equal      'varchar(8000)'
-    columns['text_basic_col'].sql_type.must_equal   'text'
-    columns['nchar_col'].sql_type.must_equal        'nchar(1)'
-    columns['ntext_col'].sql_type.must_equal        'ntext'
-    columns['binary_basic_col'].sql_type.must_equal 'binary(1)'
-    columns['varbinary_col'].sql_type.must_equal    'varbinary(8000)'
-    columns['uuid_col'].sql_type.must_equal         'uniqueidentifier'
-    columns['sstimestamp_col'].sql_type.must_equal  'timestamp'
-    columns['json_col'].sql_type.must_equal         'nvarchar(max)'
+    _(columns['real_col'].sql_type).must_equal         'real'
+    _(columns['money_col'].sql_type).must_equal        'money'
+    _(columns['smalldatetime_col'].sql_type).must_equal 'smalldatetime'
+    _(columns['datetime2_col'].sql_type).must_equal    'datetime2(7)'
+    _(columns['datetimeoffset'].sql_type).must_equal   'datetimeoffset(7)'
+    _(columns['smallmoney_col'].sql_type).must_equal   'smallmoney'
+    _(columns['char_col'].sql_type).must_equal         'char(1)'
+    _(columns['varchar_col'].sql_type).must_equal      'varchar(8000)'
+    _(columns['text_basic_col'].sql_type).must_equal   'text'
+    _(columns['nchar_col'].sql_type).must_equal        'nchar(1)'
+    _(columns['ntext_col'].sql_type).must_equal        'ntext'
+    _(columns['binary_basic_col'].sql_type).must_equal 'binary(1)'
+    _(columns['varbinary_col'].sql_type).must_equal    'varbinary(8000)'
+    _(columns['uuid_col'].sql_type).must_equal         'uniqueidentifier'
+    _(columns['sstimestamp_col'].sql_type).must_equal  'timestamp'
+    _(columns['json_col'].sql_type).must_equal         'nvarchar(max)'
     assert_line :real_col,          type: 'real',           limit: nil,           precision: nil,   scale: nil,  default: nil
     assert_line :money_col,         type: 'money',          limit: nil,           precision: 19,    scale: 4,    default: nil
     assert_line :smalldatetime_col, type: 'smalldatetime',  limit: nil,           precision: nil,   scale: nil,  default: nil
@@ -129,7 +130,7 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
 
   it 'no id with model driven primary key' do
     output = generate_schema_for_table 'sst_no_pk_data'
-    output.must_match %r{create_table "sst_no_pk_data".*id:\sfalse.*do}
+    _(output).must_match %r{create_table "sst_no_pk_data".*id:\sfalse.*do}
     assert_line :name, type: 'string', limit: nil, default: nil, collation: nil
   end
 
@@ -165,15 +166,15 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
       expected = options[key]
       message  = "#{key.to_s.titleize} of #{expected.inspect} not found in:\n#{line}"
       if expected.nil?
-        actual.must_be_nil message
+        _(actual).must_be_nil message
       elsif expected.is_a?(Array)
         actual.must_include expected, message
       elsif expected.is_a?(Float)
-        actual.must_be_close_to expected, 0.001
+        _(actual).must_be_close_to expected, 0.001
       elsif expected.is_a?(Proc)
-        actual.call.must_equal(expected.call)
+        _(actual.call).must_equal(expected.call)
       else
-        actual.must_equal expected, message
+        _(actual).must_equal expected, message
       end
     end
   end

data/test/cases/schema_test_sqlserver.rb

@@ -5,7 +5,7 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
   describe 'When table is dbo schema' do
 
     it 'find primary key for tables with odd schema' do
-      connection.primary_key('sst_natural_pk_data').must_equal 'legacy_id'
+      _(connection.primary_key('sst_natural_pk_data')).must_equal 'legacy_id'
     end
 
   end
@@ -18,7 +18,7 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
     end
 
     it 'find primary key for tables with odd schema' do
-      connection.primary_key('test.sst_schema_natural_id').must_equal 'legacy_id'
+      _(connection.primary_key('test.sst_schema_natural_id')).must_equal 'legacy_id'
     end
 
     it "have only one identity column" do

data/test/cases/showplan_test_sqlserver.rb

@@ -9,33 +9,33 @@ class ShowplanTestSQLServer < ActiveRecord::TestCase
 
     it 'from simple statement' do
       plan = Car.where(id: 1).explain
-      plan.must_include "SELECT [cars].* FROM [cars] WHERE [cars].[id] = 1"
-      plan.must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
+      _(plan).must_include "SELECT [cars].* FROM [cars] WHERE [cars].[id] = 1"
+      _(plan).must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
     end
 
     it 'from multiline statement' do
       plan = Car.where("\n id = 1 \n").explain
-      plan.must_include "SELECT [cars].* FROM [cars] WHERE (\n id = 1 \n)"
-      plan.must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
+      _(plan).must_include "SELECT [cars].* FROM [cars] WHERE (\n id = 1 \n)"
+      _(plan).must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
     end
 
     it 'from prepared statement' do
       plan = Car.where(name: ',').limit(1).explain
-      plan.must_include " SELECT  [cars].* FROM [cars] WHERE [cars].[name]"
-      plan.must_include "TOP EXPRESSION", 'make sure we do not showplan the sp_executesql'
-      plan.must_include "Clustered Index Scan", 'make sure we do not showplan the sp_executesql'
+      _(plan).must_include " SELECT  [cars].* FROM [cars] WHERE [cars].[name]"
+      _(plan).must_include "TOP EXPRESSION", 'make sure we do not showplan the sp_executesql'
+      _(plan).must_include "Clustered Index Scan", 'make sure we do not showplan the sp_executesql'
     end
 
     it 'from array condition using index' do
       plan = Car.where(id: [1, 2]).explain
-      plan.must_include " SELECT [cars].* FROM [cars] WHERE [cars].[id] IN (1, 2)"
-      plan.must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
+      _(plan).must_include " SELECT [cars].* FROM [cars] WHERE [cars].[id] IN (1, 2)"
+      _(plan).must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
     end
 
     it 'from array condition' do
       plan = Car.where(name: ['honda', 'zyke']).explain
-      plan.must_include " SELECT [cars].* FROM [cars] WHERE [cars].[name] IN (N'honda', N'zyke')"
-      plan.must_include "Clustered Index Scan", 'make sure we do not showplan the sp_executesql'
+      _(plan).must_include " SELECT [cars].* FROM [cars] WHERE [cars].[name] IN (N'honda', N'zyke')"
+      _(plan).must_include "Clustered Index Scan", 'make sure we do not showplan the sp_executesql'
     end
 
   end
@@ -45,8 +45,8 @@ class ShowplanTestSQLServer < ActiveRecord::TestCase
     it 'use simple table printer' do
       with_showplan_option('SHOWPLAN_TEXT') do
         plan = Car.where(id: 1).explain
-        plan.must_include "SELECT [cars].* FROM [cars] WHERE [cars].[id]"
-        plan.must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
+        _(plan).must_include "SELECT [cars].* FROM [cars] WHERE [cars].[id]"
+        _(plan).must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
       end
     end
 
@@ -57,7 +57,7 @@ class ShowplanTestSQLServer < ActiveRecord::TestCase
     it 'show formatted xml' do
       with_showplan_option('SHOWPLAN_XML') do
         plan = Car.where(id: 1).explain
-        plan.must_include 'ShowPlanXML'
+        _(plan).must_include 'ShowPlanXML'
       end
     end