activerecord-jdbcsqlserver-adapter 51.0.1 → 51.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b9b640ae2062ca7764593db1b993c56eb746a0ea8473be3e48a75fe91ae54be
-  data.tar.gz: 6fadd0769bc5872fece44237268c182c8c20f7f7ce425152272351841ac40e29
+  metadata.gz: d0fc70db649cdce388b0aa9682a6c67c425953238feed9db877e597edea9a887
+  data.tar.gz: ae1c960295840fecfb6a6134d012e557f2ac61c2da7f1651cd10e9ceb2f23025
 SHA512:
-  metadata.gz: f908dcf474a59423e24a2582618b2caf2549d522f52a605d4699e1552c9c47cb2c60218a6f69d0701f1885e7b0b62d5ef5531587d9dabb49ddd221dbbe11235f
-  data.tar.gz: 1f3a4938a8e7dab8aea156036c265ca64edb213700f519e28317f6b25fdbe27306316d494cf40b4b17e38e4b72375a1fcf864facd326951934fb091e8b3e22fd
+  metadata.gz: 4d17bb43ed779b8dbb7b27c12d64e00666368dd1aa7eec19a1b2ef19db4c7202dd2f4a81058ade3dcc4c4977630a4109e952f43cec683f728fcc05cc3939055c
+  data.tar.gz: bd361d607277b673f3e2f83428024730c9aa86a08b38cf5e01677dbd2b0ba7e817338c58efff22bf33ca9a915f0ae8030624f5d93bfb84a3053d04a81e05c7f1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v51.1.0
+
+* Updated activerecord-jdbc-adapter dependecy to fix an issue with inserts on tables with composite primary keys
+* Changed how the jdbc driver is loaded so that other drivers can be used if needed
+
 ## v51.0.0
 
 * Forked original gem to provide JRuby support
@@ -55,4 +60,3 @@
 #### Added
 
 * Support MismatchedForeignKey exception.
-

data/VERSION

@@ -1 +1 @@
-51.0.1
+51.1.0

data/activerecord-jdbcsqlserver-adapter.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord', '~> 5.1.0', '>= 5.1.7'
-  spec.add_dependency 'activerecord-jdbc-adapter' , '~> 51.5'
+  spec.add_dependency 'activerecord-jdbc-adapter' , '~> 51.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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcsqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 51.0.1
+  version: 51.1.0
 platform: ruby
 authors:
 - Ken Collins
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-06 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.1.7
   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: '51.5'
+        version: '51.8'
   name: activerecord-jdbc-adapter
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '51.5'
+        version: '51.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:
     - - ">="
@@ -157,6 +157,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/setup.sh
@@ -243,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC SQL Server Adapter.