activerecord-jdbc-alt-adapter 71.0.0.alpha2-java → 72.0.0.alpha1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6590c4d705c35e5a4849e4ef0bb076efba93509b8bcd8b4c2db49a4bc84b0f31
-  data.tar.gz: cb87d9f9f2763b178f990359efecb6b1199cbe15866460bb837232fcdd8b75e1
+  metadata.gz: 9368e28d99e49de4164150e2e006ce8991be7d7aab58e6773936866f86dbbdd0
+  data.tar.gz: '03983c9218db6dd3a9ab278b0364ded1d9f5c315853b7ed6b543a05cca8c6c6c'
 SHA512:
-  metadata.gz: 511e55410d149724a0765b5494a15ca4fe493bbd36b969a587d7bab23458cb32a45d34c01f79ca8b170b7f1e86fdf58e81bc4ba3ea15d464fe954a8266c41743
-  data.tar.gz: 9fdfe69ab63373f8e31cd2d60f5ae88fd3f4499250010aab4ffbeabb9c9345f017bb012932598a84297bd63d8b28f5bc38d18213f95b19b3307a93f38ecfc775
+  metadata.gz: 450ddae41c05f2519c53ff0ad17de0bfd3cfefa1a471775a9d27946843f2d685301ff12cbbcdd4f434f275ee4f067798fc500ff49a2f2ec79f2339dfede6fc8c
+  data.tar.gz: aa9aa18ad21ead09d7bab3180032c8fa71ffee37fbb43dbba6a52ac3b436da34010e229e10cf1d6eec9edb2a803addcd0585a0b8ac78bdba05281f77dc7f5924

data/.github/workflows/ruby.yml

@@ -27,7 +27,7 @@ jobs:
         ruby-version: ['jruby-head']
         db: ['mysql2']
         test_targets: ["rails:test_mysql2"]
-        ar_version: ["7-1-stable"]
+        ar_version: ["7-2-stable"]
         prepared_statements: ['false', 'true']
         driver: ['MySQL']
 
@@ -42,7 +42,7 @@ jobs:
       AR_VERSION: ${{ matrix.ar_version }}
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
       DRIVER: ${{ matrix.driver }}
-      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
 
     steps:
       - uses: actions/checkout@v4
@@ -79,7 +79,7 @@ jobs:
         ruby-version: [ 'jruby-head' ]
         db: [ 'postgresql' ]
         test_targets: [ "rails:test_postgresql" ]
-        ar_version: ["7-1-stable"]
+        ar_version: ["7-2-stable"]
         prepared_statements: [ 'false', 'true' ]
 
     services:
@@ -95,7 +95,7 @@ jobs:
     env:
       DB: ${{ matrix.db }}
       AR_VERSION: ${{ matrix.ar_version }}
-      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
       PGHOST: localhost
       PGPORT: 5432
@@ -129,12 +129,12 @@ jobs:
         ruby-version: ['jruby-head']
         db: ['sqlite3']
         test_targets: ["rails:test_sqlite3"]
-        ar_version: ["7-1-stable", "main"]
+        ar_version: ["7-2-stable"]
 
     env:
       DB: ${{ matrix.db }}
       AR_VERSION: ${{ matrix.ar_version }}
-      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
 
     steps:
       - uses: actions/checkout@v4
@@ -149,7 +149,7 @@ jobs:
           rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
       - name: Run tests
         run: |
-          bundle exec rake ${{ matrix.test_targets }}
+          bundle exec rake ${{ matrix.test_targets }} --trace
 
   test-arjdbc-mysql:
 
@@ -173,7 +173,7 @@ jobs:
     env:
       DB: ${{ matrix.db }}
       DRIVER: ${{ matrix.driver }}
-      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
       MY_USER: root
       MY_PASSWORD: root
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
@@ -222,7 +222,7 @@ jobs:
     env:
       DB: ${{ matrix.db }}
       DRIVER: ${{ matrix.driver }}
-      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
       INSERT_RETURNING: ${{ matrix.insert_returning }}
       PGHOST: localhost

data/Gemfile

@@ -62,13 +62,13 @@ group :test do
   gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
 
   gem 'bcrypt', '~> 3.1.11', require: false
-  gem 'jdbc-mssql', '~> 12.2', require: nil
+  gem 'jdbc-mssql', '~> 12.6', require: nil
   # gem 'pry-debugger-jruby', platform: :jruby
 end
 
 group :rails do
   group :test do
-    gem 'minitest', require: nil
+    gem 'minitest', '~> 5.24.0', require: nil
     gem 'minitest-excludes', require: nil
     gem 'minitest-rg', require: nil
 

data/README.md

@@ -145,9 +145,10 @@ Versions are targeted at certain versions of Rails and live on their own branche
 | 60.x        | 6.0.x         | 60-stable | 9.2.7     | 8        |
 | 61.x        | 6.1.x         | 61-stable | 9.2.7     | 8        |
 | 70.x        | 7.0.x         | 70-stable | 9.3.0     | 8        |
-| 71.x        | 7.1.x         | master    | 9.4.3     | 8        |
+| 71.x        | 7.1.x         | 71-stable | 9.4.3     | 8        |
+| 72.x        | 7.2.x         | master    | 9.4.3     | 8        |
 
-Note: 71.x is still under development and not supported yet.
+Note: 72.x is still under development and not supported yet.
 
 Note that JRuby 9.1.x and JRuby 9.2.x are at end-of-life. We recommend Java 8
 at a minimum for all versions.

data/activerecord-jdbc-adapter.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 
-  gem.add_dependency 'activerecord', '~> 7.1.3'
+  gem.add_dependency "activerecord", "~> 7.2.2"
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/activerecord-jdbc-alt-adapter.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 
-  gem.add_dependency 'activerecord', '~> 7.1.3'
+  gem.add_dependency "activerecord", "~> 7.2.2"
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arel/visitors/sqlserver.rb

@@ -83,15 +83,17 @@ module Arel
         @select_statement = nil
       end
 
-      def visit_Arel_Table o, collector
+      def visit_Arel_Table(o, collector)
         # Apparently, o.engine.connection can actually be a different adapter
         # than sqlserver. Can be removed if fixed in ActiveRecord. See:
         # github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues/450
         table_name = begin
-          if o.class.engine.connection.respond_to?(:sqlserver?) && o.class.engine.connection.database_prefix_remote_server?
-            remote_server_table_name(o)
-          else
-            quote_table_name(o.name)
+          o.class.engine.with_connection do |connection|
+            if connection.respond_to?(:sqlserver?) && connection.database_prefix_remote_server?
+              remote_server_table_name(o)
+            else
+              quote_table_name(o.name)
+            end
           end
         rescue Exception => e
           quote_table_name(o.name)
@@ -241,15 +243,30 @@ module Arel
 
         # column_name = schema_cache.primary_keys(t.name) || column_cache(t.name).first.try(:second).try(:name)
         # NOTE: for table name aliases columns_hash('table_alias')  requires to return an empty hash.
-        column_name = @connection.schema_cache.primary_keys(t.name) ||
-          @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
+        primary_keys = @connection.schema_cache.primary_keys(t.name)
+        column_name = nil
+
+        case primary_keys
+        when NilClass
+          column_name = @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
+        when String
+          column_name = primary_keys
+        when Array
+          candidate_columns = @connection.schema_cache.columns_hash(t.name).slice(*primary_keys).values
+          candidate_column = candidate_columns.find(&:identity?)
+          candidate_column ||= candidate_columns.first
+          column_name = candidate_column.try(:name)
+        end
+
         column_name ? t[column_name] : nil
       end
 
-      def remote_server_table_name o
-        ActiveRecord::ConnectionAdapters::SQLServer::Utils.extract_identifiers(
-          "#{o.class.engine.connection.database_prefix}#{o.name}"
-        ).quoted
+      def remote_server_table_name(o)
+        o.class.engine.with_connection do |connection|
+          ActiveRecord::ConnectionAdapters::SQLServer::Utils.extract_identifiers(
+            "#{connection.database_prefix}#{o.name}"
+          ).quoted
+        end
       end
 
       # Need to remove ordering from subqueries unless TOP/OFFSET also used. Otherwise, SQLServer

data/lib/arjdbc/abstract/connection_management.rb

@@ -46,13 +46,12 @@ module ArJdbc
       end
 
       def reconnect
-        if active?
-          @raw_connection.rollback rescue nil
-        else
-          connect
-        end
-      end
+        @raw_connection&.close
+
+        @raw_connection = nil
 
+        connect
+      end
     end
   end
 end

data/lib/arjdbc/abstract/database_statements.rb

@@ -78,20 +78,8 @@ module ArJdbc
       end
       alias :exec_delete :exec_update
 
-      def execute(sql, name = nil, async: false, allow_retry: false, materialize_transactions: true)
-        sql = transform_query(sql)
-        
-        if preventing_writes? && write_query?(sql)
-          raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
-        end
-
-        mark_transaction_written_if_write(sql)
-
-        raw_execute(sql, name, async: async, allow_retry: allow_retry, materialize_transactions: materialize_transactions)
-      end
-
       # overridden to support legacy binds
-      def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil, async: false)
+      def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil, async: false, allow_retry: false)
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
         super
       end
@@ -107,7 +95,9 @@ module ArJdbc
       def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
         log(sql, name, async: async) do
           with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
-            conn.execute(sql)
+            result = conn.execute(sql)
+            verified!
+            result
           end
         end
       end

data/lib/arjdbc/abstract/relation_query_attribute_monkey_patch.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "active_model/attribute"
+
+module ActiveRecord
+  # NOTE: improved implementation for hash methods that is used to
+  # compare objects. AR and arel commonly use `[a, b] - [b]` operations and
+  # JRuby internally uses the hash method to implement that operation,
+  # on the other hand, CRuby does not use the hash method
+  # for small arrays (length <= 16).
+  class Relation
+    # monkey patch
+    module RelationQueryAttributeMonkeyPatch
+      def hash
+        # [self.class, name, value_for_database, type].hash
+        [self.class, name, value_before_type_cast, type].hash
+      end
+    end
+
+    class QueryAttribute
+      prepend RelationQueryAttributeMonkeyPatch
+    end
+  end
+end

data/lib/arjdbc/mssql/adapter.rb

@@ -30,6 +30,10 @@ require 'arjdbc/mssql/errors'
 require 'arjdbc/mssql/schema_creation'
 require 'arjdbc/mssql/database_limits'
 
+require "arjdbc/mssql/adapter_hash_config"
+
+require "arjdbc/abstract/relation_query_attribute_monkey_patch"
+
 module ActiveRecord
   module ConnectionAdapters
     # MSSQL (SQLServer) adapter class definition
@@ -42,6 +46,7 @@ module ActiveRecord
       # include ArJdbc::Abstract::DatabaseStatements
       # include ArJdbc::Abstract::StatementCache
       include ArJdbc::Abstract::TransactionSupport
+      include ArJdbc::MSSQLConfig
 
       include MSSQL::Quoting
       include MSSQL::SchemaStatements
@@ -79,7 +84,8 @@ module ActiveRecord
         # configure_connection happens in super
         super
 
-        conn_params = @config.compact
+        # assign arjdbc extra connection params
+        conn_params = build_connection_config(@config.compact)
 
         @raw_connection = nil
 
@@ -338,7 +344,7 @@ module ActiveRecord
 
         schemas_and_tables.map do |schema_table|
           schema, table = schema_table
-          "#{quote_name_part(schema)}.#{quote_name_part(table)}"
+          "#{self.class.mssql_quote_name_part(schema)}.#{self.class.mssql_quote_name_part(table)}"
         end
       end
 

data/lib/arjdbc/mssql/adapter_hash_config.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module ArJdbc
+  module MSSQLConfig
+    def build_connection_config(config)
+      config = config.deep_dup
+
+      load_jdbc_driver
+
+      config[:driver] ||= database_driver_name
+
+      config[:host] ||= "localhost"
+      config[:connection_alive_sql] ||= "SELECT 1"
+      config[:lock_timeout] ||= 5000
+
+      config[:url] ||= build_connection_url(config)
+
+      config
+    end
+
+    private
+
+    def load_jdbc_driver
+      require "jdbc/mssql"
+
+      ::Jdbc::Mssql.load_driver if defined?(::Jdbc::Mssql.load_driver)
+    rescue LoadError
+      # assuming driver.jar is on the class-path
+    end
+
+    def database_driver_name
+      "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+    end
+
+    def build_connection_url(config)
+      url = "".dup
+      url << "jdbc:sqlserver://#{config[:host]}"
+      url << ( config[:port] ? ":#{config[:port]};" : ';' )
+      url << "databaseName=#{config[:database]};" if config[:database]
+      url << "instanceName=#{config[:instance]};" if config[:instance]
+      url << "sendTimeAsDatetime=#{config[:send_time_as_datetime] || false};"
+      url << "loginTimeout=#{config[:login_timeout].to_i};" if config[:login_timeout]
+      url << "lockTimeout=#{config[:lock_timeout].to_i};"
+      url << "encrypt=#{config[:encrypt]};" if config.key?(:encrypt)
+      url << "trustServerCertificate=#{config[:trust_server_certificate]};" if config.key?(:trust_server_certificate)
+      app = config[:application_name] || config[:appname] || config[:application]
+      url << "applicationName=#{app};" if app
+      isc = config[:integrated_security] # Win only - needs sqljdbc_auth.dll
+      url << "integratedSecurity=#{isc};" unless isc.nil?
+      url
+    end
+  end
+end

data/lib/arjdbc/mssql/database_statements.rb

@@ -90,7 +90,7 @@ module ActiveRecord
           end
         end
 
-        def internal_exec_query(sql, name = 'SQL', binds = [], prepare: false, async: false)
+        def internal_exec_query(sql, name = 'SQL', binds = [], prepare: false, async: false, allow_retry: false)
           sql = transform_query(sql)
 
           check_if_write_query(sql)
@@ -244,7 +244,7 @@ module ActiveRecord
         end
 
         def raw_jdbc_connection
-          @raw_connection
+          any_raw_connection
         end
 
         # It seems the truncate_tables is mostly used for testing

data/lib/arjdbc/mssql/quoting.rb

@@ -4,6 +4,62 @@ module ActiveRecord
   module ConnectionAdapters
     module MSSQL
       module Quoting
+        extend ActiveSupport::Concern
+
+        QUOTED_COLUMN_NAMES = Concurrent::Map.new # :nodoc:
+        QUOTED_TABLE_NAMES = Concurrent::Map.new # :nodoc:
+
+        module ClassMethods # :nodoc:
+          def column_name_matcher
+            /
+              \A
+              (
+                (?:
+                  # \[table_name\].\[column_name\] | function(one or no argument)
+                  ((?:\w+\.|\[\w+\]\.)?(?:\w+|\[\w+\])) | \w+\((?:|\g<2>)\)
+                )
+                (?:\s+AS\s+(?:\w+|\[\w+\]))?
+              )
+              (?:\s*,\s*\g<1>)*
+              \z
+            /ix
+          end
+
+          def column_name_with_order_matcher
+            /
+              \A
+              (
+                (?:
+                  # \[table_name\].\[column_name\] | function(one or no argument)
+                  ((?:\w+\.|\[\w+\]\.)?(?:\w+|\[\w+\])) | \w+\((?:|\g<2>)\)
+                )
+                (?:\s+ASC|\s+DESC)?
+              )
+              (?:\s*,\s*\g<1>)*
+              \z
+            /ix
+          end
+
+          def quote_column_name(name)
+            QUOTED_COLUMN_NAMES[name] ||= mssql_quote_column_name(name)
+          end
+
+          def quote_table_name(name)
+            QUOTED_TABLE_NAMES[name] ||= mssql_quote_column_name(name)
+          end
+
+          def mssql_quote_column_name(name)
+            name = name.to_s.split(".")
+            name.map! { |n| mssql_quote_name_part(n) } # "[#{name}]"
+            name.join(".")
+          end
+
+          # Implements the quoting style for SQL Server
+          def mssql_quote_name_part(part)
+            part =~ /^\[.*\]$/ ? part : "[#{part.gsub(']', ']]')}]"
+          end
+        end
+
         QUOTED_TRUE  = '1'
         QUOTED_FALSE = '0'
 
@@ -88,42 +144,6 @@ module ActiveRecord
         # @see #quote in old adapter
         BLOB_VALUE_MARKER = "''"
 
-        def column_name_matcher
-          COLUMN_NAME
-        end
-
-        def column_name_with_order_matcher
-          COLUMN_NAME_WITH_ORDER
-        end
-
-        COLUMN_NAME = /
-          \A
-          (
-            (?:
-              # \[table_name\].\[column_name\] | function(one or no argument)
-              ((?:\w+\.|\[\w+\]\.)?(?:\w+|\[\w+\])) | \w+\((?:|\g<2>)\)
-            )
-            (?:\s+AS\s+(?:\w+|\[\w+\]))?
-          )
-          (?:\s*,\s*\g<1>)*
-          \z
-        /ix
-
-        COLUMN_NAME_WITH_ORDER = /
-          \A
-          (
-            (?:
-              # \[table_name\].\[column_name\] | function(one or no argument)
-              ((?:\w+\.|\[\w+\]\.)?(?:\w+|\[\w+\])) | \w+\((?:|\g<2>)\)
-            )
-            (?:\s+ASC|\s+DESC)?
-          )
-          (?:\s*,\s*\g<1>)*
-          \z
-        /ix
-
-        private_constant :COLUMN_NAME, :COLUMN_NAME_WITH_ORDER
-
         private
 
         def time_with_db_timezone(value)

data/lib/arjdbc/mssql/schema_statements.rb

@@ -182,20 +182,8 @@ module ActiveRecord
           rename_table_indexes(table_name, new_name)
         end
 
-        # This is the same as the abstract method
-        def quote_table_name(name)
-          quote_column_name(name)
-        end
-
-        # This overrides the abstract method to be specific to SQL Server.
-        def quote_column_name(name)
-          name = name.to_s.split('.')
-          name.map! { |n| quote_name_part(n) } # "[#{name}]"
-          name.join('.')
-        end
-
         def quote_database_name(name)
-          quote_name_part(name.to_s)
+          self.class.mssql_quote_name_part(name.to_s)
         end
 
         # @private these cannot specify a limit
@@ -439,11 +427,6 @@ module ActiveRecord
           result
         end
 
-        # Implements the quoting style for SQL Server
-        def quote_name_part(part)
-          part =~ /^\[.*\]$/ ? part : "[#{part.gsub(']', ']]')}]"
-        end
-
         def remove_check_constraints(table_name, column_name)
           constraints = select_values "SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE where TABLE_NAME = '#{quote_string(table_name)}' and COLUMN_NAME = '#{quote_string(column_name)}'", 'SCHEMA'
           constraints.each do |constraint|

data/lib/arjdbc/mssql.rb

@@ -6,4 +6,4 @@ module ArJdbc
   MsSQL = MSSQL # compatibility with 1.2
 end
 
-ArJdbc.warn_unsupported_adapter 'mssql', [7, 0] # warns on AR >= 4.2
+ArJdbc.warn_unsupported_adapter "mssql", [7, 2] # warns on AR >= 4.2

data/lib/arjdbc/mysql/adapter.rb

@@ -11,6 +11,10 @@ require 'arjdbc/abstract/database_statements'
 require 'arjdbc/abstract/statement_cache'
 require 'arjdbc/abstract/transaction_support'
 
+require "arjdbc/mysql/adapter_hash_config"
+
+require "arjdbc/abstract/relation_query_attribute_monkey_patch"
+
 module ActiveRecord
   module ConnectionAdapters
     AbstractMysqlAdapter.class_eval do
@@ -32,6 +36,7 @@ module ActiveRecord
       include ArJdbc::Abstract::TransactionSupport
 
       include ArJdbc::MySQL
+      include ArJdbc::MysqlConfig
 
       class << self
         def jdbc_connection_class
@@ -66,6 +71,9 @@ module ActiveRecord
 
         @config[:flags] ||= 0
 
+        # assign arjdbc extra connection params
+        conn_params = build_connection_config(@config.compact)
+
         # JDBC mysql appears to use found rows by default: https://dev.mysql.com/doc/connector-j/en/connector-j-connp-props-connection.html
         # if @config[:flags].kind_of? Array
         #   @config[:flags].push "FOUND_ROWS"
@@ -73,7 +81,7 @@ module ActiveRecord
         #   @config[:flags] |= ::Mysql2::Client::FOUND_ROWS
         # end
 
-        @connection_parameters ||= @config
+        @connection_parameters = conn_params
       end
 
       def self.database_exists?(config)