activerecord-jdbcsqlserver-adapter 50.1.0 → 51.0.0

data/test/cases/schema_dumper_test_sqlserver.rb

@@ -38,17 +38,17 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     # Character Strings
     assert_line :char_10,           type: 'char',         limit: 10,            precision: nil,   scale: nil,  default: "1234567890",           collation: nil
     assert_line :varchar_50,        type: 'varchar',      limit: 50,            precision: nil,   scale: nil,  default: "test varchar_50",      collation: nil
-    assert_line :varchar_max,       type: 'varchar_max',  limit: 2147483647,    precision: nil,   scale: nil,  default: "test varchar_max",     collation: nil
-    assert_line :text,              type: 'text_basic',   limit: 2147483647,    precision: nil,   scale: nil,  default: "test text",            collation: nil
+    assert_line :varchar_max,       type: 'varchar_max',  limit: nil,           precision: nil,   scale: nil,  default: "test varchar_max",     collation: nil
+    assert_line :text,              type: 'text_basic',   limit: nil,           precision: nil,   scale: nil,  default: "test text",            collation: nil
     # Unicode Character Strings
     assert_line :nchar_10,          type: 'nchar',        limit: 10,            precision: nil,   scale: nil,  default: "12345678åå",           collation: nil
     assert_line :nvarchar_50,       type: 'string',       limit: 50,            precision: nil,   scale: nil,  default: "test nvarchar_50 åå",  collation: nil
-    assert_line :nvarchar_max,      type: 'text',         limit: 2147483647,    precision: nil,   scale: nil,  default: "test nvarchar_max åå", collation: nil
-    assert_line :ntext,             type: 'ntext',        limit: 2147483647,    precision: nil,   scale: nil,  default: "test ntext åå",        collation: nil
+    assert_line :nvarchar_max,      type: 'text',         limit: nil,           precision: nil,   scale: nil,  default: "test nvarchar_max åå", collation: nil
+    assert_line :ntext,             type: 'ntext',        limit: nil,           precision: nil,   scale: nil,  default: "test ntext åå",        collation: nil
     # Binary Strings
     assert_line :binary_49,         type: 'binary_basic', limit: 49,            precision: nil,   scale: nil,  default: nil
     assert_line :varbinary_49,      type: 'varbinary',    limit: 49,            precision: nil,   scale: nil,  default: nil
-    assert_line :varbinary_max,     type: 'binary',       limit: 2147483647,    precision: nil,   scale: nil,  default: nil
+    assert_line :varbinary_max,     type: 'binary',       limit: nil,           precision: nil,   scale: nil,  default: nil
     # Other Data Types
     assert_line :uniqueidentifier,  type: 'uuid',         limit: nil,           precision: nil,   scale: nil,  default: -> { "newid()" }
     assert_line :timestamp,         type: 'ss_timestamp', limit: nil,           precision: nil,   scale: nil,  default: nil
@@ -76,12 +76,12 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :decimal_col,     type: 'decimal',      limit: nil,          precision: 18,   scale: 0,   default: nil
     assert_line :float_col,       type: 'float',        limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :string_col,      type: 'string',       limit: nil,          precision: nil,  scale: nil, default: nil
-    assert_line :text_col,        type: 'text',         limit: 2147483647,   precision: nil,  scale: nil, default: nil
+    assert_line :text_col,        type: 'text',         limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :datetime_col,    type: 'datetime',     limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :timestamp_col,   type: 'datetime',     limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :time_col,        type: 'time',         limit: nil,          precision: 7,    scale: nil, default: nil
     assert_line :date_col,        type: 'date',         limit: nil,          precision: nil,  scale: nil, default: nil
-    assert_line :binary_col,      type: 'binary',       limit: 2147483647,   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'
@@ -107,14 +107,14 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :smallmoney_col,    type: 'smallmoney',     limit: nil,           precision: 10,    scale: 4,    default: nil
     assert_line :char_col,          type: 'char',           limit: 1,             precision: nil,   scale: nil,  default: nil
     assert_line :varchar_col,       type: 'varchar',        limit: nil,           precision: nil,   scale: nil,  default: nil
-    assert_line :text_basic_col,    type: 'text_basic',     limit: 2147483647,    precision: nil,   scale: nil,  default: nil
+    assert_line :text_basic_col,    type: 'text_basic',     limit: nil,           precision: nil,   scale: nil,  default: nil
     assert_line :nchar_col,         type: 'nchar',          limit: 1,             precision: nil,   scale: nil,  default: nil
-    assert_line :ntext_col,         type: 'ntext',          limit: 2147483647,    precision: nil,   scale: nil,  default: nil
+    assert_line :ntext_col,         type: 'ntext',          limit: nil,           precision: nil,   scale: nil,  default: nil
     assert_line :binary_basic_col,  type: 'binary_basic',   limit: 1,             precision: nil,   scale: nil,  default: nil
     assert_line :varbinary_col,     type: 'varbinary',      limit: nil,           precision: nil,   scale: nil,  default: nil
     assert_line :uuid_col,          type: 'uuid',           limit: nil,           precision: nil,   scale: nil,  default: nil
     assert_line :sstimestamp_col,   type: 'ss_timestamp',   limit: nil,           precision: nil,   scale: nil,  default: nil
-    assert_line :json_col,          type: 'text',           limit: 2147483647,    precision: nil,   scale: nil,  default: nil
+    assert_line :json_col,          type: 'text',           limit: nil,           precision: nil,   scale: nil,  default: nil
   end
 
   # Special Cases

data/test/cases/specific_schema_test_sqlserver.rb

@@ -9,12 +9,6 @@ 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

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/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/models/sqlserver/trigger.rb

@@ -0,0 +1,7 @@
+class SSTestTrigger < ActiveRecord::Base
+  self.table_name = 'sst_table_with_trigger'
+end
+
+class SSTestTriggerUuid < ActiveRecord::Base
+  self.table_name = 'sst_table_with_uuid_trigger'
+end

data/test/models/sqlserver/trigger_history.rb

@@ -0,0 +1,3 @@
+class SSTestTriggerHistory < ActiveRecord::Base
+  self.table_name = 'sst_table_with_trigger_history'
+end

data/test/schema/sqlserver_specific_schema.rb

@@ -64,10 +64,6 @@ ActiveRecord::Schema.define do
     t.uuid   :uuid_nil_default, default: nil
   end
 
-  create_table '[some.Name]', force: true do |t|
-    t.varchar :name
-  end
-
   create_table 'sst_my$strange_table', force: true do |t|
     t.string :name
   end
@@ -148,7 +144,7 @@ ActiveRecord::Schema.define do
 
   # Constraints
 
-  create_table(:sst_has_fks, force: true) { |t| t.column(:fk_id, :integer, null: false) }
+  create_table(:sst_has_fks, force: true) { |t| t.column(:fk_id, :bigint, null: false) }
   create_table(:sst_has_pks, force: true) { }
   execute <<-ADDFKSQL
     ALTER TABLE sst_has_fks
@@ -181,6 +177,44 @@ ActiveRecord::Schema.define do
       FROM sst_string_defaults
   STRINGDEFAULTSBIGVIEW
 
+  # Trigger
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_trigger') DROP TABLE sst_table_with_trigger"
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_trigger_history') DROP TABLE sst_table_with_trigger_history"
+  execute <<-SQL
+    CREATE TABLE sst_table_with_trigger(
+      id bigint IDENTITY NOT NULL PRIMARY KEY,
+      event_name nvarchar(255)
+    )
+    CREATE TABLE sst_table_with_trigger_history(
+      id bigint IDENTITY NOT NULL PRIMARY KEY,
+      id_source nvarchar(36),
+      event_name nvarchar(255)
+    )
+  SQL
+  execute <<-SQL
+    CREATE TRIGGER sst_table_with_trigger_t ON sst_table_with_trigger
+    FOR INSERT
+    AS
+    INSERT INTO sst_table_with_trigger_history (id_source, event_name)
+    SELECT id AS id_source, event_name FROM INSERTED
+  SQL
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_uuid_trigger') DROP TABLE sst_table_with_uuid_trigger"
+  execute <<-SQL
+    CREATE TABLE sst_table_with_uuid_trigger(
+      id uniqueidentifier DEFAULT NEWID() PRIMARY KEY,
+      event_name nvarchar(255)
+    )
+  SQL
+  execute <<-SQL
+    CREATE TRIGGER sst_table_with_uuid_trigger_t ON sst_table_with_uuid_trigger
+    FOR INSERT
+    AS
+    INSERT INTO sst_table_with_trigger_history (id_source, event_name)
+    SELECT id AS id_source, event_name FROM INSERTED
+  SQL
+
   # Another schema.
 
   create_table :sst_schema_columns, force: true do |t|

data/test/support/sql_counter_sqlserver.rb

@@ -13,7 +13,7 @@ module ARTest
     end
 
     ignored_sql = [
-      /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)/im,
+      /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS|KEY_COLUMN_USAGE)/im,
       /SELECT @@version/,
       /SELECT @@TRANCOUNT/,
       /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
@@ -21,7 +21,8 @@ module ARTest
       /SELECT DATABASEPROPERTYEX/im
     ]
 
-    ActiveRecord::SQLCounter.ignored_sql.concat(ignored_sql)
+    sqlcounter = ObjectSpace.each_object(ActiveRecord::SQLCounter).to_a.first
+    sqlcounter.instance_variable_set :@ignore, Regexp.union(ignored_sql.push(sqlcounter.ignore))
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcsqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 50.1.0
+  version: 51.0.0
 platform: ruby
 authors:
 - Ken Collins
@@ -15,42 +15,42 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: 5.1.7
   name: activerecord
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: 5.1.7
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '50.8'
+        version: '51.5'
   name: activerecord-jdbc-adapter
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '50.8'
+        version: '51.5'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -58,8 +58,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
   name: jdbc-mssql
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -76,13 +76,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- BACKERS.md
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile
 - Guardfile
 - MIT-LICENSE
-- RAILS5-TODO.md
 - README.md
 - RUNNING_UNIT_TESTS.md
 - Rakefile
@@ -92,6 +92,7 @@ files:
 - docker-compose.ci.yml
 - lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb
+- lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/date_time.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb
@@ -156,9 +157,9 @@ files:
 - lib/activerecord-sqlserver-adapter.rb
 - lib/arel/visitors/sqlserver.rb
 - lib/arel_sqlserver.rb
-- lib/jdbc_mssql_driver_loader.rb
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
+- test/bin/setup.sh
 - test/bin/wait-for.sh
 - test/cases/adapter_test_sqlserver.rb
 - test/cases/coerced_tests.rb
@@ -180,6 +181,7 @@ files:
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
+- test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
 - test/config.yml
@@ -191,7 +193,6 @@ files:
 - test/models/sqlserver/datatype.rb
 - test/models/sqlserver/datatype_migration.rb
 - test/models/sqlserver/dollar_table_name.rb
-- test/models/sqlserver/dot_table_name.rb
 - test/models/sqlserver/edge_schema.rb
 - test/models/sqlserver/fk_has_fk.rb
 - test/models/sqlserver/fk_has_pk.rb
@@ -207,6 +208,8 @@ files:
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.rb
 - test/models/sqlserver/tinyint_pk.rb
+- test/models/sqlserver/trigger.rb
+- test/models/sqlserver/trigger_history.rb
 - test/models/sqlserver/upper.rb
 - test/models/sqlserver/uppered.rb
 - test/models/sqlserver/uuid.rb
@@ -240,13 +243,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project:
+rubygems_version: 2.7.9
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC SQL Server Adapter.
 test_files:
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
+- test/bin/setup.sh
 - test/bin/wait-for.sh
 - test/cases/adapter_test_sqlserver.rb
 - test/cases/coerced_tests.rb
@@ -268,6 +273,7 @@ test_files:
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
+- test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
 - test/config.yml
@@ -279,7 +285,6 @@ test_files:
 - test/models/sqlserver/datatype.rb
 - test/models/sqlserver/datatype_migration.rb
 - test/models/sqlserver/dollar_table_name.rb
-- test/models/sqlserver/dot_table_name.rb
 - test/models/sqlserver/edge_schema.rb
 - test/models/sqlserver/fk_has_fk.rb
 - test/models/sqlserver/fk_has_pk.rb
@@ -295,6 +300,8 @@ test_files:
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.rb
 - test/models/sqlserver/tinyint_pk.rb
+- test/models/sqlserver/trigger.rb
+- test/models/sqlserver/trigger_history.rb
 - test/models/sqlserver/upper.rb
 - test/models/sqlserver/uppered.rb
 - test/models/sqlserver/uuid.rb

data/RAILS5-TODO.md

@@ -1,5 +0,0 @@
-
-## Rails v5.1
-
-* BIGINT PK support. https://github.com/rails/rails/pull/26266
-

data/lib/jdbc_mssql_driver_loader.rb

@@ -1,22 +0,0 @@
-module JdbcMssqlDriverLoader
-  def self.check_and_maybe_load_driver
-    driver_name = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-    if (Java::JavaClass.for_name(driver_name) rescue nil)
-      driver = Java::ComMicrosoftSqlserverJdbc::SQLServerDriver.new
-      which = driver
-        .getClass().getClassLoader().loadClass(driver_name)
-        .getProtectionDomain().getCodeSource().getLocation().to_s
-      warn "You already required a mssql jdbc driver (#{which}), skipping gem jdbc-mssql"
-
-      major_version = driver.major_version
-      required_major_version = 8
-      if major_version < required_major_version
-        raise "MSSQL jdbc driver version is to old (given major version #{major_version} < required major version #{required_major_version})"
-      end
-    else
-      require "jdbc/mssql"
-    end
-  end
-
-  check_and_maybe_load_driver
-end

data/test/models/sqlserver/dot_table_name.rb

@@ -1,3 +0,0 @@
-class SSTestDotTableName < ActiveRecord::Base
-  self.table_name = '[dbo].[some.Name]'
-end