activerecord-jdbcsqlserver-adapter 50.0.0 → 52.0.0

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

@@ -5,25 +5,40 @@ class ShowplanTestSQLServer < ActiveRecord::TestCase
 
   fixtures :cars
 
+  # For some reason the default max width truncates values that we are looking for in jruby
+  ActiveRecord::ConnectionAdapters::SQLServer::Showplan::PrinterTable.max_column_width = 500 if defined? JRUBY_VERSION
+
   describe 'Unprepare previously prepared SQL' do
 
     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'
+    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'
     end
 
   end
@@ -33,8 +48,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
 
@@ -45,7 +60,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
 

data/test/cases/specific_schema_test_sqlserver.rb

@@ -9,16 +9,10 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
     SSTestDollarTableName.limit(20).offset(1)
   end
 
-  it 'handle dot table names' do
-    SSTestDotTableName.create! name: 'test'
-    SSTestDotTableName.limit(20).offset(1)
-    SSTestDotTableName.where(name: 'test').first.must_be :present?
-  end
-
   it 'models can use tinyint pk tables' do
     obj = SSTestTinyintPk.create! name: '1'
-    ['Fixnum', 'Integer'].must_include obj.id.class.name
-    SSTestTinyintPk.find(obj.id).must_equal obj
+    _(['Fixnum', 'Integer']).must_include obj.id.class.name
+    _(SSTestTinyintPk.find(obj.id)).must_equal obj
   end
 
   it 'be able to complex count tables with no primary key' do
@@ -64,17 +58,17 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
 
   it 'default objects work' do
     obj = SSTestObjectDefault.create! name: 'MetaSkills'
-    obj.date.must_be_nil 'since this is set on insert'
-    obj.reload.date.must_be_instance_of Date
+    _(obj.date).must_be_nil 'since this is set on insert'
+    _(obj.reload.date).must_be_instance_of Date
   end
 
   it 'allows datetime2 as timestamps' do
-    SSTestBooking.columns_hash['created_at'].sql_type.must_equal 'datetime2(7)'
-    SSTestBooking.columns_hash['updated_at'].sql_type.must_equal 'datetime2(7)'
+    _(SSTestBooking.columns_hash['created_at'].sql_type).must_equal 'datetime2(7)'
+    _(SSTestBooking.columns_hash['updated_at'].sql_type).must_equal 'datetime2(7)'
     obj1 = SSTestBooking.new name: 'test1'
     obj1.save!
-    obj1.created_at.must_be_instance_of Time
-    obj1.updated_at.must_be_instance_of Time
+    _(obj1.created_at).must_be_instance_of Time
+    _(obj1.updated_at).must_be_instance_of Time
   end
 
   # Natural primary keys.
@@ -134,10 +128,10 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
     o = SSTestDatatypeMigration.create!
     o.varchar_col = "O'Reilly"
     o.save!
-    o.reload.varchar_col.must_equal "O'Reilly"
+    _(o.reload.varchar_col).must_equal "O'Reilly"
     o.varchar_col = nil
     o.save!
-    o.reload.varchar_col.must_be_nil
+    _(o.reload.varchar_col).must_be_nil
   end
 
   # With column names that have spaces
@@ -166,7 +160,7 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
   it 'returns a new id via connection newid_function' do
     acceptable_uuid = ActiveRecord::ConnectionAdapters::SQLServer::Type::Uuid::ACCEPTABLE_UUID
     db_uuid = ActiveRecord::Base.connection.newid_function
-    db_uuid.must_match(acceptable_uuid)
+    _(db_uuid).must_match(acceptable_uuid)
   end
 
   # with similar table definition in two schemas

data/test/cases/transaction_test_sqlserver.rb

@@ -34,22 +34,22 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
   it 'can use an isolation level and reverts back to starting isolation level' do
     in_level = nil
     begin_level = connection.user_options_isolation_level
-    begin_level.must_match %r{read committed}i
+    _(begin_level).must_match %r{read committed}i
     Ship.transaction(isolation: :serializable) do
       Ship.create! name: 'Black Pearl'
       in_level = connection.user_options_isolation_level
     end
     after_level = connection.user_options_isolation_level
-    in_level.must_match %r{serializable}i
-    after_level.must_match %r{read committed}i
+    _(in_level).must_match %r{serializable}i
+    _(after_level).must_match %r{read committed}i
   end
 
   it 'can use an isolation level and reverts back to starting isolation level under exceptions' do
-    connection.user_options_isolation_level.must_match %r{read committed}i
-    lambda {
+    _(connection.user_options_isolation_level).must_match %r{read committed}i
+    _(lambda {
       Ship.transaction(isolation: :serializable) { Ship.create! }
-    }.must_raise(ActiveRecord::RecordInvalid)
-    connection.user_options_isolation_level.must_match %r{read committed}i
+    }).must_raise(ActiveRecord::RecordInvalid)
+    _(connection.user_options_isolation_level).must_match %r{read committed}i
   end
 
   describe 'when READ_COMMITTED_SNAPSHOT is set' do
@@ -64,7 +64,7 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
     end
 
     it 'should use READ COMMITTED as an isolation level' do
-      connection.user_options_isolation_level.must_match "read committed snapshot"
+      _(connection.user_options_isolation_level).must_match "read committed snapshot"
 
       Ship.transaction(isolation: :serializable) do
         Ship.create! name: 'Black Pearl'
@@ -73,7 +73,7 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
       # We're actually testing that the isolation level was correctly reset to
       # "READ COMMITTED", and that no exception was raised (it's reported back
       # by SQL Server as "read committed snapshot").
-      connection.user_options_isolation_level.must_match "read committed snapshot"
+      _(connection.user_options_isolation_level).must_match "read committed snapshot"
     end
   end
 

data/test/cases/trigger_test_sqlserver.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+require 'cases/helper_sqlserver'
+
+class SQLServerTriggerTest < ActiveRecord::TestCase
+  after  { exclude_output_inserted_table_names.clear }
+
+  let(:exclude_output_inserted_table_names) do
+    ActiveRecord::ConnectionAdapters::SQLServerAdapter.exclude_output_inserted_table_names
+  end
+
+  it 'can insert into a table with output inserted - with a true setting for table name' do
+    exclude_output_inserted_table_names['sst_table_with_trigger'] = true
+    assert SSTestTriggerHistory.all.empty?
+    obj = SSTestTrigger.create! event_name: 'test trigger'
+    _(['Fixnum', 'Integer']).must_include obj.id.class.name
+    _(obj.event_name).must_equal 'test trigger'
+    _(obj.id).must_be :present?
+    _(obj.id.to_s).must_equal SSTestTriggerHistory.first.id_source
+  end
+
+  it 'can insert into a table with output inserted - with a uniqueidentifier value' do
+    skip 'OUTPUT.inserted not supported at this point' if defined? JRUBY_VERSION
+    exclude_output_inserted_table_names['sst_table_with_uuid_trigger'] = 'uniqueidentifier'
+    assert SSTestTriggerHistory.all.empty?
+    obj = SSTestTriggerUuid.create! event_name: 'test uuid trigger'
+    _(obj.id.class.name).must_equal 'String'
+    _(obj.event_name).must_equal 'test uuid trigger'
+    _(obj.id).must_be :present?
+    _(obj.id.to_s).must_equal SSTestTriggerHistory.first.id_source
+  end
+end

data/test/cases/utils_test_sqlserver.rb

@@ -3,15 +3,15 @@ require 'cases/helper_sqlserver'
 class UtilsTestSQLServer < ActiveRecord::TestCase
 
   it '.quote_string' do
-    SQLServer::Utils.quote_string("I'll store this in C:\\Users").must_equal "I''ll store this in C:\\Users"
+    _(SQLServer::Utils.quote_string("I'll store this in C:\\Users")).must_equal "I''ll store this in C:\\Users"
   end
 
   it '.unquote_string' do
-    SQLServer::Utils.unquote_string("I''ll store this in C:\\Users").must_equal "I'll store this in C:\\Users"
+    _(SQLServer::Utils.unquote_string("I''ll store this in C:\\Users")).must_equal "I'll store this in C:\\Users"
   end
 
   it '.quoted_raw' do
-    SQLServer::Utils.quoted_raw("some.Name").must_equal "[some.Name]"
+    _(SQLServer::Utils.quoted_raw("some.Name")).must_equal "[some.Name]"
   end
 
   describe '.extract_identifiers constructor and thus SQLServer::Utils::Name value object' do
@@ -47,8 +47,8 @@ class UtilsTestSQLServer < ActiveRecord::TestCase
     it 'extracts and returns #object identifier unquoted by default or quoted as needed' do
       valid_names.each do |n|
         name = extract_identifiers(n)
-        name.object.must_equal 'object', "With #{n.inspect} for #object"
-        name.object_quoted.must_equal '[object]', "With #{n.inspect} for #object_quoted"
+        _(name.object).must_equal 'object', "With #{n.inspect} for #object"
+        _(name.object_quoted).must_equal '[object]', "With #{n.inspect} for #object_quoted"
       end
     end
 
@@ -58,64 +58,64 @@ class UtilsTestSQLServer < ActiveRecord::TestCase
         present, blank = send(:"#{part}_names")
         present.each do |n|
           name = extract_identifiers(n)
-          name.send(:"#{part}").must_equal "#{part}", "With #{n.inspect} for ##{part} method"
-          name.send(:"#{part}_quoted").must_equal "[#{part}]", "With #{n.inspect} for ##{part}_quoted method"
+          _(name.send(:"#{part}")).must_equal "#{part}", "With #{n.inspect} for ##{part} method"
+          _(name.send(:"#{part}_quoted")).must_equal "[#{part}]", "With #{n.inspect} for ##{part}_quoted method"
         end
         blank.each do |n|
           name = extract_identifiers(n)
-          name.send(:"#{part}").must_be_nil "With #{n.inspect} for ##{part} method"
-          name.send(:"#{part}_quoted").must_be_nil "With #{n.inspect} for ##{part}_quoted method"
+          _(name.send(:"#{part}")).must_be_nil "With #{n.inspect} for ##{part} method"
+          _(name.send(:"#{part}_quoted")).must_be_nil "With #{n.inspect} for ##{part}_quoted method"
         end
       end
 
     end
 
     it 'does not blow up on nil or blank string name' do
-      extract_identifiers(nil).object.must_be_nil
-      extract_identifiers(' ').object.must_be_nil
+      _(extract_identifiers(nil).object).must_be_nil
+      _(extract_identifiers(' ').object).must_be_nil
     end
 
     it 'has a #quoted that returns a fully quoted name with all identifiers as orginially passed in' do
-      extract_identifiers('object').quoted.must_equal '[object]'
-      extract_identifiers('server.database..object').quoted.must_equal '[server].[database]..[object]'
-      extract_identifiers('[server]...[object]').quoted.must_equal '[server]...[object]'
+      _(extract_identifiers('object').quoted).must_equal '[object]'
+      _(extract_identifiers('server.database..object').quoted).must_equal '[server].[database]..[object]'
+      _(extract_identifiers('[server]...[object]').quoted).must_equal '[server]...[object]'
     end
 
     it 'can take a symbol argument' do
-      extract_identifiers(:object).object.must_equal 'object'
+      _(extract_identifiers(:object).object).must_equal 'object'
     end
 
     it 'allows identifiers with periods to work' do
-      extract_identifiers('[obj.name]').quoted.must_equal '[obj.name]'
-      extract_identifiers('[obj.name].[foo]').quoted.must_equal '[obj.name].[foo]'
+      _(extract_identifiers('[obj.name]').quoted).must_equal '[obj.name]'
+      _(extract_identifiers('[obj.name].[foo]').quoted).must_equal '[obj.name].[foo]'
     end
 
     it 'should indicate if a name is fully qualitified' do
-      extract_identifiers('object').fully_qualified?.must_equal false
-      extract_identifiers('schema.object').fully_qualified?.must_equal false
-      extract_identifiers('database.schema.object').fully_qualified?.must_equal false
-      extract_identifiers('database.object').fully_qualified?.must_equal false
-      extract_identifiers('server...object').fully_qualified?.must_equal false
-      extract_identifiers('server.database..object').fully_qualified?.must_equal false
-      extract_identifiers('server.database.schema.object').fully_qualified?.must_equal true
-      extract_identifiers('server.database.schema.').fully_qualified?.must_equal true
-      extract_identifiers('[obj.name]').fully_qualified?.must_equal false
-      extract_identifiers('[schema].[obj.name]').fully_qualified?.must_equal false
-      extract_identifiers('[database].[schema].[obj.name]').fully_qualified?.must_equal false
-      extract_identifiers('[database].[obj.name]').fully_qualified?.must_equal false
-      extract_identifiers('[server.name]...[obj.name]').fully_qualified?.must_equal false
-      extract_identifiers('[server.name].[database]..[obj.name]').fully_qualified?.must_equal false
-      extract_identifiers('[server.name].[database].[schema].[obj.name]').fully_qualified?.must_equal true
-      extract_identifiers('[server.name].[database].[schema].').fully_qualified?.must_equal true
+      _(extract_identifiers('object').fully_qualified?).must_equal false
+      _(extract_identifiers('schema.object').fully_qualified?).must_equal false
+      _(extract_identifiers('database.schema.object').fully_qualified?).must_equal false
+      _(extract_identifiers('database.object').fully_qualified?).must_equal false
+      _(extract_identifiers('server...object').fully_qualified?).must_equal false
+      _(extract_identifiers('server.database..object').fully_qualified?).must_equal false
+      _(extract_identifiers('server.database.schema.object').fully_qualified?).must_equal true
+      _(extract_identifiers('server.database.schema.').fully_qualified?).must_equal true
+      _(extract_identifiers('[obj.name]').fully_qualified?).must_equal false
+      _(extract_identifiers('[schema].[obj.name]').fully_qualified?).must_equal false
+      _(extract_identifiers('[database].[schema].[obj.name]').fully_qualified?).must_equal false
+      _(extract_identifiers('[database].[obj.name]').fully_qualified?).must_equal false
+      _(extract_identifiers('[server.name]...[obj.name]').fully_qualified?).must_equal false
+      _(extract_identifiers('[server.name].[database]..[obj.name]').fully_qualified?).must_equal false
+      _(extract_identifiers('[server.name].[database].[schema].[obj.name]').fully_qualified?).must_equal true
+      _(extract_identifiers('[server.name].[database].[schema].').fully_qualified?).must_equal true
     end
 
     it 'can return fully qualified quoted table name' do
       name = extract_identifiers('[my.server].db.schema.')
-      name.fully_qualified_database_quoted.must_equal '[my.server].[db]'
+      _(name.fully_qualified_database_quoted).must_equal '[my.server].[db]'
       name = extract_identifiers('[server.name].[database].[schema].[object]')
-      name.fully_qualified_database_quoted.must_equal '[server.name].[database]'
+      _(name.fully_qualified_database_quoted).must_equal '[server.name].[database]'
       name = extract_identifiers('server.database.schema.object')
-      name.fully_qualified_database_quoted.must_equal '[server].[database]'
+      _(name.fully_qualified_database_quoted).must_equal '[server].[database]'
     end
 
   end

data/test/cases/uuid_test_sqlserver.rb

@@ -6,26 +6,26 @@ class SQLServerUuidTest < ActiveRecord::TestCase
   let(:acceptable_uuid) { ActiveRecord::ConnectionAdapters::SQLServer::Type::Uuid::ACCEPTABLE_UUID }
 
   it 'has a uuid primary key' do
-    SSTestUuid.columns_hash['id'].type.must_equal :uuid
+    _(SSTestUuid.columns_hash['id'].type).must_equal :uuid
     assert SSTestUuid.primary_key
   end
 
   it 'can create with a new pk' do
     skip 'We do not support uuid autogenerated primary keys at this time' if defined? JRUBY_VERSION
     obj = SSTestUuid.create!
-    obj.id.must_be :present?
-    obj.id.must_match acceptable_uuid
+    _(obj.id).must_be :present?
+    _(obj.id).must_match acceptable_uuid
   end
 
   it 'can create other uuid column on reload' do
     skip 'We do not support uuid autogenerated primary keys at this time' if defined? JRUBY_VERSION
     obj = SSTestUuid.create!
     obj.reload
-    obj.other_uuid.must_match acceptable_uuid
+    _(obj.other_uuid).must_match acceptable_uuid
   end
 
   it 'can find uuid pk via connection' do
-    connection.primary_key(SSTestUuid.table_name).must_equal 'id'
+    _(connection.primary_key(SSTestUuid.table_name)).must_equal 'id'
   end
 
   it 'changing column default' do
@@ -33,17 +33,17 @@ class SQLServerUuidTest < ActiveRecord::TestCase
     connection.add_column table_name, :thingy, :uuid, null: false, default: "NEWSEQUENTIALID()"
     SSTestUuid.reset_column_information
     column = SSTestUuid.columns_hash['thingy']
-    column.default_function.must_equal "newsequentialid()"
+    _(column.default_function).must_equal "newsequentialid()"
     # Now to a different function.
     connection.change_column table_name, :thingy, :uuid, null: false, default: "NEWID()"
     SSTestUuid.reset_column_information
     column = SSTestUuid.columns_hash['thingy']
-    column.default_function.must_equal "newid()"
+    _(column.default_function).must_equal "newid()"
   end
 
   it 'can insert even when use_output_inserted to false ' do
     obj = with_use_output_inserted_disabled { SSTestUuid.create!(name: "😢") }
-    obj.id.must_be :nil?
+    _(obj.id).must_be :nil?
   end
 
 end

data/test/config.yml

@@ -19,7 +19,7 @@ connections:
       dataserver: <%= ENV['ACTIVERECORD_UNITTEST_DATASERVER'] %>
       tds_version: <%= ENV['ACTIVERECORD_UNITTEST_TDSVERSION'] %>
       azure: <%= !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil? %>
-      timeout: <%= ENV['ACTIVERECORD_UNITTEST_AZURE'].present? ? 20 : nil %>
+      timeout: <%= ENV['ACTIVERECORD_UNITTEST_AZURE'].present? ? 20 : 10 %>
     arunit2:
       <<: *default_connection_info
       database: activerecord_unittest2
@@ -27,7 +27,7 @@ connections:
       dataserver: <%= ENV['ACTIVERECORD_UNITTEST_DATASERVER'] %>
       tds_version: <%= ENV['ACTIVERECORD_UNITTEST_TDSVERSION'] %>
       azure: <%= !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil? %>
-      timeout: <%= ENV['ACTIVERECORD_UNITTEST_AZURE'].present? ? 20 : nil %>
+      timeout: <%= ENV['ACTIVERECORD_UNITTEST_AZURE'].present? ? 20 : 10 %>
 
   jdbc:
     arunit:

data/test/migrations/create_clients_and_change_column_null.rb

@@ -0,0 +1,23 @@
+class CreateClientsAndChangeColumnNull < ActiveRecord::Migration[5.2]
+  def up
+    create_table :clients do |t|
+      t.string :name
+      t.string :code
+      t.decimal :value
+
+      t.timestamps
+    end
+
+    change_column :clients, :name, :string, limit: 15
+    change_column :clients, :code, :string, default: 'n/a'
+    change_column :clients, :value, :decimal, precision: 32, scale: 8
+
+    change_column_null :clients, :name, false
+    change_column_null :clients, :code, false
+    change_column_null :clients, :value, false
+  end
+
+  def down
+    drop_table :clients
+  end
+end