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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a773766cbb0e3ea279a04ab67b60c578382c604214c0a3dd5e54b7f419f4b96
-  data.tar.gz: d0f347ef628b4b791d81ad46a34d20f8ea3acb75cee3a473b2dbd8784769e897
+  metadata.gz: 973f3cfa750c3424b5de9105f177584edea8ebe705d50b20e4b9f6d989a4919f
+  data.tar.gz: e7f86bfeb49f90f2767e3bdcc3e0101a58149e97421e8d7b96da8f59fc469959
 SHA512:
-  metadata.gz: 7c08cd49b3245c655a4c51d5c0d327cf7f058a7c2c98cedf7a59f00f60d14e7d79b1d9c2eef614712cee71b684f717fd6edd7c122fd0349d775a7e4fb2a48150
-  data.tar.gz: b1a059930367508754dc54ff2b8b76434991ac2897ea4ff4917a7ef540d25c28272c4c5cbe13f5b5215eded00940c9beece3f2415860a69b4621a7c62664fa02
+  metadata.gz: f276911281e38f162526b603959f5798fa5d09c73284a79078376126b5fade87add2e4a4345242029a4b4e39097b5a6964651483576f51ed8bee3ac7b6e586a3
+  data.tar.gz: 8e5d458add630631bfaa82605f20d28c80310e25787c9db2c94c1b8cc677ac8ff6e0730c97b6271a333cbfe919da8a35ad8deb7911aeedc89c3021629e0c5370

data/.github/workflows/main.yml

@@ -31,9 +31,12 @@ jobs:
         db: ['mssql']
         test_targets: ['test_mssql']
 
+    # NOTE: using a specific tag, it fails with 2019-latest.
+    # it seems the issue is related to some changes in mssql tools
+    # https://learn.microsoft.com/en-au/answers/questions/1853144/error-failed-to-initialize-container-mcr-microsoft
     services:
       mssql:
-        image: mcr.microsoft.com/mssql/server:2019-latest
+        image: mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04
         env:
           ACCEPT_EULA: Y
           MSSQL_SA_PASSWORD: Password12!
@@ -112,7 +115,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:10
+        image: postgres:11
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -157,7 +160,7 @@ jobs:
 
     services:
       mssql:
-        image: mcr.microsoft.com/mssql/server:2019-latest
+        image: mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04
         env:
           ACCEPT_EULA: Y
           MSSQL_SA_PASSWORD: Password12!
@@ -243,7 +246,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:10
+        image: postgres:11
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust

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,12 +79,12 @@ 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:
       postgres:
-        image: postgres:10
+        image: postgres:11
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -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 }}
@@ -211,7 +211,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:10
+        image: postgres:11
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -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/.gitignore

@@ -19,6 +19,8 @@ nbproject
 .project
 *.sqlite
 *.sqlite3
+*.sqlite3-shm
+*.sqlite3-wal
 *.derby
 derby.log
 test.hsqldb*
@@ -33,8 +35,9 @@ Gemfile.lock
 .settings
 activerecord-jdbc.iml
 lib/arjdbc/jdbc/adapter_java.jar
-.jrubyrc
 tags
-pik.sh
-.ruby-version
+.jrubyrc
 .rubocop.yml
+.solargraph.yml
+pik.sh
+.tool-versions

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.0'
+  gem.add_dependency 'activerecord', '~> 7.1.3'
 
   #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

@@ -241,8 +241,21 @@ 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
 

data/lib/arjdbc/abstract/connection_management.rb

@@ -36,20 +36,22 @@ module ArJdbc
       #  end
       # end
 
+      private
+
       # DIFFERENCE: we delve into jdbc shared code and this does self.class.new_client.
       def connect
-        @raw_connection = jdbc_connection_class(@config[:adapter_spec]).new(@config, self)
-        @raw_connection.configure_connection
+        @raw_connection = self.class.new_client(@connection_parameters, self)
+      rescue ActiveRecord::ConnectionNotEstablished => ex
+        raise ex.set_pool(@pool)
       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/core.rb

@@ -2,23 +2,17 @@
 
 module ArJdbc
   module Abstract
-
     # This is minimum amount of code needed from base JDBC Adapter class to make common adapters
     # work.  This replaces using jdbc/adapter as a base class for all adapters.
     module Core
-
-      attr_reader :config
-
-      def initialize(config)
-        @config = config
+      def initialize(...)
+        super
 
         if self.class.equal? ActiveRecord::ConnectionAdapters::JdbcAdapter
           spec = @config.key?(:adapter_spec) ? @config[:adapter_spec] :
                      ( @config[:adapter_spec] = adapter_spec(@config) ) # due resolving visitor
           extend spec if spec
         end
-
-        super(config) # AbstractAdapter
       end
 
       # Retrieve the raw `java.sql.Connection` object.

data/lib/arjdbc/abstract/database_statements.rb

@@ -33,7 +33,7 @@ module ArJdbc
 
       # It appears that at this point (AR 5.0) "prepare" should only ever be true
       # if prepared statements are enabled
-      def internal_exec_query(sql, name = nil, binds = NO_BINDS, prepare: false, async: false)
+      def internal_exec_query(sql, name = nil, binds = NO_BINDS, prepare: false, async: false, allow_retry: false, materialize_transactions: true)
         sql = transform_query(sql)
 
         if preventing_writes? && write_query?(sql)
@@ -78,18 +78,6 @@ 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)
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
@@ -104,10 +92,12 @@ module ArJdbc
         end
       end
 
-      def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: false)
+      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/abstract/statement_cache.rb

@@ -24,7 +24,7 @@ module ArJdbc
 
         # Only say we support the statement cache if we are using prepared statements
         # and have a max number of statements defined
-        statement_limit = self.class.type_cast_config_to_integer(config[:statement_limit])
+        statement_limit = self.class.type_cast_config_to_integer(@config[:statement_limit])
         @jdbc_statement_cache_enabled = prepared_statements && (statement_limit.nil? || statement_limit > 0)
 
         @statements = StatementPool.new(statement_limit) # AR (5.0) expects this to be stored as @statements

data/lib/arjdbc/abstract/transaction_support.rb

@@ -107,16 +107,3 @@ module ArJdbc
     end
   end
 end
-
-# patch to avoid the usage of WeakMap
-require 'active_record/connection_adapters/abstract/transaction'
-module ActiveRecord
-  module ConnectionAdapters
-    class Transaction
-      def add_record(record, ensure_finalize = true)
-        @records ||= []
-        @records << record
-      end
-    end
-  end
-end

data/lib/arjdbc/mssql/adapter.rb

@@ -30,6 +30,8 @@ require 'arjdbc/mssql/errors'
 require 'arjdbc/mssql/schema_creation'
 require 'arjdbc/mssql/database_limits'
 
+require "arjdbc/abstract/relation_query_attribute_monkey_patch"
+
 module ActiveRecord
   module ConnectionAdapters
     # MSSQL (SQLServer) adapter class definition
@@ -88,15 +90,20 @@ module ActiveRecord
 
       # @override
       def active?
-        return false unless @raw_connection
+        @lock.synchronize do
+          return false unless @raw_connection
 
-        @raw_connection.active?
+          @raw_connection.active?
+        end
       end
 
       # @override
       def disconnect!
-        super # clear_cache! && reset_transaction
-        @raw_connection&.disconnect!
+        @lock.synchronize do
+          super # clear_cache! && reset_transaction
+          @raw_connection&.disconnect!
+          @raw_connection = nil
+        end
       end
 
       # Returns the (JDBC) `ActiveRecord` column class for this adapter.
@@ -490,6 +497,10 @@ module ActiveRecord
           RangeError.new(message, sql: sql, binds: binds)
         when /Snapshot isolation transaction aborted due to update conflict. You cannot use snapshot isolation/
           StatementInvalid.new(message, sql: sql, binds: binds)
+        when /Incorrect syntax near the keyword .*/
+          StatementInvalid.new(message, sql: sql, binds: binds)
+        when /Could not find stored procedure .*/
+          StatementInvalid.new(message, sql: sql, binds: binds)
         else
           super
         end

data/lib/arjdbc/mssql/schema_statements.rb

@@ -174,9 +174,12 @@ module ActiveRecord
           end
         end
 
-        def rename_table(table_name, new_table_name)
-          execute "EXEC sp_rename '#{table_name}', '#{new_table_name}'"
-          rename_table_indexes(table_name, new_table_name)
+        def rename_table(table_name, new_name, **options)
+          validate_table_length!(new_name) unless options[:_uses_legacy_table_name]
+          schema_cache.clear_data_source_cache!(table_name.to_s)
+          schema_cache.clear_data_source_cache!(new_name.to_s)
+          execute "EXEC sp_rename '#{table_name}', '#{new_name}'"
+          rename_table_indexes(table_name, new_name)
         end
 
         # This is the same as the abstract method

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, 1] # warns on AR >= 4.2

data/lib/arjdbc/mysql/adapter.rb

@@ -11,6 +11,8 @@ require 'arjdbc/abstract/database_statements'
 require 'arjdbc/abstract/statement_cache'
 require 'arjdbc/abstract/transaction_support'
 
+require "arjdbc/abstract/relation_query_attribute_monkey_patch"
+
 module ActiveRecord
   module ConnectionAdapters
     AbstractMysqlAdapter.class_eval do
@@ -23,7 +25,7 @@ module ActiveRecord
     class Mysql2Adapter < AbstractMysqlAdapter
       ADAPTER_NAME = 'Mysql2'
 
-      include Jdbc::ConnectionPoolCallbacks
+      # include Jdbc::ConnectionPoolCallbacks
 
       include ArJdbc::Abstract::ConnectionManagement
       include ArJdbc::Abstract::DatabaseStatements
@@ -33,6 +35,34 @@ module ActiveRecord
 
       include ArJdbc::MySQL
 
+      class << self
+        def jdbc_connection_class
+          ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
+        end
+
+        def new_client(conn_params, adapter_instance)
+          jdbc_connection_class.new(conn_params, adapter_instance)
+        end
+
+        private
+          def initialize_type_map(m)
+            super
+
+            m.register_type(%r(char)i) do |sql_type|
+              limit = extract_limit(sql_type)
+              Type.lookup(:string, adapter: :mysql2, limit: limit)
+            end
+
+            m.register_type %r(^enum)i, Type.lookup(:string, adapter: :mysql2)
+            m.register_type %r(^set)i,  Type.lookup(:string, adapter: :mysql2)
+          end
+      end
+
+      # NOTE: redefines constant defined in abstract class however this time
+      # will use methods defined in the mysql abstract class and map properly
+      # mysql types.
+      TYPE_MAP = Type::TypeMap.new.tap { |m| initialize_type_map(m) }
+
       def initialize(...)
         super
 
@@ -171,7 +201,7 @@ module ActiveRecord
       #++
 
       def active?
-        !(@raw_connection.nil? || @raw_connection.closed?)  && @lock.synchronize { @raw_connection&.execute_query("/* ping */ SELECT 1") } || false
+        !(@raw_connection.nil? || @raw_connection.closed?) && @lock.synchronize { @raw_connection&.ping } || false
       end
 
       alias :reset! :reconnect!
@@ -221,14 +251,21 @@ module ActiveRecord
         @full_version ||= any_raw_connection.full_version
       end
 
-      def jdbc_connection_class(spec)
-        ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
-      end
-
       def jdbc_column_class
         ::ActiveRecord::ConnectionAdapters::MySQL::Column
       end
 
+      def translate_exception(exception, message:, sql:, binds:)
+        case message
+        when /Table .* doesn't exist/i
+          StatementInvalid.new(message, sql: sql, binds: binds, connection_pool: @pool)
+        when /BLOB, TEXT, GEOMETRY or JSON column .* can't have a default value/i
+          StatementInvalid.new(message, sql: sql, binds: binds, connection_pool: @pool)
+        else
+          super
+        end
+      end
+
       # defined in MySQL::DatabaseStatements which is not included
       def default_insert_value(column)
         super unless column.auto_increment?