activerecord-jdbcsqlserver-adapter 50.0.0 → 50.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d264fa23b69908328c1e4f17fc5b69b2d2de67ed14394ef5127e9767379ccfe9
-  data.tar.gz: c9fa8ecde64528237123e97bf8ed99a26d03d9d83341e7510f3d67d8de4b2b63
+  metadata.gz: 0a5acd7cd424c10d62f5c2c1b71c8375fd736ed7ec7793c85a3fd6dc0f0f23f6
+  data.tar.gz: 597ccc6cfb6d8533555dda1eb7598132cd932f80c78f936b85b69daef9545271
 SHA512:
-  metadata.gz: ce260ce665bbde6fabeacef58e7b7a4d417e1b453d46c440942c0dba50caf0acbe764932cfa23fc45cb468753e9cd681e88be58f30f1b8ff7e6830c5404eff6b
-  data.tar.gz: c17157b072dae81728644a308b89dc401e623d277db94be9f246f5a1b986e63becec559decb4af2a504de961213dc1c026d61a38cf0f908dc1157768523d01b5
+  metadata.gz: c55e61e720f4de8c51cd94a34be67eb16b3d9d1c34888471e8eb14e3fc1f590eb404b90f7cc19a16534a135ab3665dc57ea1551e78c49777ff3d678816d888e9
+  data.tar.gz: a731bb86cac95cb46e1876b65ff7740f855c0759fd0751ee08fcb7f4f5497247ad8e6633671d7ab468289770bea319656a64ce8934f42b0b9b512bb8171fa91b

data/VERSION

@@ -1 +1 @@
-50.0.0
+50.1.0

data/activerecord-jdbcsqlserver-adapter.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.add_dependency 'activerecord', '~> 5.0.0', '>= 5.0.6'
-  spec.add_dependency 'activerecord-jdbc-adapter' , '~> 50.5'
+  spec.add_dependency 'activerecord-jdbc-adapter' , '~> 50.8'
   spec.add_dependency 'jdbc-mssql', '>= 0.6.0'
 end

data/lib/activerecord-jdbcsqlserver-adapter.rb

@@ -2,7 +2,7 @@
 require 'active_record/connection_adapters/sqlserver/core_ext/date_time'
 
 # Load the jar file for the jdbc driver
-require 'jdbc/mssql'
+require_relative './jdbc_mssql_driver_loader'
 
 # Standadard arjdbc functionality
 require 'arjdbc/abstract/connection_management'

data/lib/jdbc_mssql_driver_loader.rb

@@ -0,0 +1,22 @@
+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/cases/adapter_test_sqlserver.rb

@@ -16,7 +16,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   it 'has basic and non-senstive information in the adpaters inspect method' do
     string = connection.inspect
     string.must_match %r{ActiveRecord::ConnectionAdapters::SQLServerAdapter}
-    string.must_match %r{version\: \d.\d}
+    string.must_match %r{version\: \d\d\.\d}
     string.must_match %r{mode: (dblib|jdbc)}
     string.must_match %r{azure: (true|false)}
     string.wont_match %r{host}
@@ -427,4 +427,3 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   end
 
 end
-

data/test/cases/helper_sqlserver.rb

@@ -9,7 +9,7 @@ require 'support/load_schema_sqlserver'
 require 'support/coerceable_test_sqlserver'
 require 'support/sql_counter_sqlserver'
 require 'support/connection_reflection'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase

data/test/support/sql_counter_sqlserver.rb

@@ -21,8 +21,7 @@ module ARTest
       /SELECT DATABASEPROPERTYEX/im
     ]
 
-    sqlcounter = ObjectSpace.each_object(ActiveRecord::SQLCounter).to_a.first
-    sqlcounter.instance_variable_set :@ignore, Regexp.union(ignored_sql.push(sqlcounter.ignore))
+    ActiveRecord::SQLCounter.ignored_sql.concat(ignored_sql)
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcsqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 50.0.0
+  version: 50.1.0
 platform: ruby
 authors:
 - Ken Collins
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -27,8 +27,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.6
   name: activerecord
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '50.5'
+        version: '50.8'
   name: activerecord-jdbc-adapter
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '50.5'
+        version: '50.8'
 - !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
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -156,6 +156,7 @@ 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/wait-for.sh