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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c3d514e216f7046d55347dee117af72c6f9970542a59d720e4a570adc51481c
-  data.tar.gz: fb7ae7aa872404230ce35232237c4917f73971d0a39ef40998ca3ab6e11422af
+  metadata.gz: 3a773766cbb0e3ea279a04ab67b60c578382c604214c0a3dd5e54b7f419f4b96
+  data.tar.gz: d0f347ef628b4b791d81ad46a34d20f8ea3acb75cee3a473b2dbd8784769e897
 SHA512:
-  metadata.gz: 53c2771f7803cf7b5b34ddfb3d3786c4478263fd43ec609bf726b60b8c9056e799f3ebf61f6d48fc3fc7450ee2c15e9cf66be61784a48fec3edb64cd36b88d15
-  data.tar.gz: 7c23c77d26b5e845c3f9c779c5761f4fbce1ff29db75e5a8a9ea7cf115f14b2cf4be6d56d172f16200f5866f54e5c68253f0293c44be7bd2c2c7034a908af9a7
+  metadata.gz: 7c08cd49b3245c655a4c51d5c0d327cf7f058a7c2c98cedf7a59f00f60d14e7d79b1d9c2eef614712cee71b684f717fd6edd7c122fd0349d775a7e4fb2a48150
+  data.tar.gz: b1a059930367508754dc54ff2b8b76434991ac2897ea4ff4917a7ef540d25c28272c4c5cbe13f5b5215eded00940c9beece3f2415860a69b4621a7c62664fa02

data/.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.2.0']
+        ruby-version: ['jruby-9.4.8.0']
         db: ['mssql']
         test_targets: ['test_mssql']
 
@@ -68,18 +68,47 @@ jobs:
         run: |
           bundle exec rake ${{ matrix.test_targets }}
 
-  test-rails-pgsql:
+  test-arjdbc-sqlite:
 
-    name: Rails Tests (Postgres)
+    name: ARJDBC Tests (SQLite)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ 'jruby-9.4.2.0' ]
-        db: [ 'postgresql' ]
-        test_targets: [ "rails:test_postgresql" ]
-        ar_version: ["7-0-stable"]
-        prepared_statements: [ 'false', 'true' ]
+        ruby-version: ['jruby-9.4.8.0']
+        db: ['sqlite3']
+        test_targets: ['test_sqlite3']
+
+    env:
+      DB: ${{ matrix.db }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Build
+        run: |
+          rake jar
+      - name: Run tests
+        run: |
+          bundle exec rake ${{ matrix.test_targets }}
+
+  test-arjdbc-pgsql:
+
+    name: ARJDBC Tests (Postgres)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['jruby-9.4.8.0']
+        db: ['postgresql']
+        test_targets: ["db:postgresql test_postgresql"]
+        prepared_statements: ['false', 'true']
+        insert_returning: ['false', 'true']
 
     services:
       postgres:
@@ -93,16 +122,64 @@ jobs:
 
     env:
       DB: ${{ matrix.db }}
-      AR_VERSION: ${{ matrix.ar_version }}
       JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
-      JDBC_SQLITE_VERSION: "3.32.3.3"
+      INSERT_RETURNING: ${{ matrix.insert_returning }}
       PGHOST: localhost
       PGPORT: 5432
       PGUSER: postgres
 
     steps:
       - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Build
+        run: |
+          rake jar
+      - name: Run tests
+        run: |
+          bundle exec rake ${{ matrix.test_targets }}
+
+  test-rails-mssql:
+
+    name: Rails Tests (mssql)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [ 'jruby-9.4.8.0' ]
+        db: [ 'mssql' ]
+        test_targets: [ "rails:test_mssql" ]
+        ar_version: ["7-1-stable-dev"]
+
+    services:
+      mssql:
+        image: mcr.microsoft.com/mssql/server:2019-latest
+        env:
+          ACCEPT_EULA: Y
+          MSSQL_SA_PASSWORD: Password12!
+        ports:
+          - 1433:1433
+        options: >-
+          --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P \"Password12!\" -l 30 -Q \"SELECT 1\""
+          --health-start-period 10s
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
+    env:
+      DB: ${{ matrix.db }}
+      AR_VERSION: ${{ matrix.ar_version }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      JDBC_SQLITE_VERSION: "3.32.3.3"
+      SQLUSER: SA
+      SQLPASS: Password12!
+
+    steps:
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -110,8 +187,8 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Setup database
         run: |
-          psql -c "create database activerecord_unittest;" -U postgres
-          psql -c "create database activerecord_unittest2;" -U postgres
+          /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "Password12!" -Q "CREATE DATABASE jdbc_arunit;"
+          /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "Password12!" -Q "CREATE DATABASE jdbc_arunit2;"
       - name: Build
         run: |
           rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
@@ -119,18 +196,50 @@ jobs:
         run: |
           bundle exec rake ${{ matrix.test_targets }}
 
-  test-arjdbc-pgsql:
+  test-rails-sqlite:
 
-    name: ARJDBC Tests (Postgres)
+    name: Rails Tests (SQLite)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.2.0']
-        db: ['postgresql']
-        test_targets: ["db:postgresql test_postgresql"]
-        prepared_statements: ['false', 'true']
-        insert_returning: ['false', 'true']
+        ruby-version: ['jruby-9.4.8.0']
+        db: ['sqlite3']
+        test_targets: ["rails:test_sqlite3"]
+        ar_version: ["7-1-stable"]
+
+    env:
+      DB: ${{ matrix.db }}
+      AR_VERSION: ${{ matrix.ar_version }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Build
+        run: |
+          echo "JAVA_OPTS=$JAVA_OPTS"
+          rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
+      - name: Run tests
+        run: |
+          bundle exec rake ${{ matrix.test_targets }}
+
+  test-rails-pgsql:
+
+    name: Rails Tests (Postgres)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [ 'jruby-9.4.8.0' ]
+        db: [ 'postgresql' ]
+        test_targets: [ "rails:test_postgresql" ]
+        ar_version: ["7-1-stable"]
+        prepared_statements: [ 'false', 'true' ]
 
     services:
       postgres:
@@ -144,9 +253,10 @@ jobs:
 
     env:
       DB: ${{ matrix.db }}
+      AR_VERSION: ${{ matrix.ar_version }}
       JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
-      INSERT_RETURNING: ${{ matrix.insert_returning }}
+      JDBC_SQLITE_VERSION: "3.32.3.3"
       PGHOST: localhost
       PGPORT: 5432
       PGUSER: postgres
@@ -158,9 +268,13 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Setup database
+        run: |
+          psql -c "create database activerecord_unittest;" -U postgres
+          psql -c "create database activerecord_unittest2;" -U postgres
       - name: Build
         run: |
-          rake jar
+          rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
       - name: Run tests
         run: |
           bundle exec rake ${{ matrix.test_targets }}

data/.github/workflows/ruby.yml

@@ -27,7 +27,7 @@ jobs:
         ruby-version: ['jruby-head']
         db: ['mysql2']
         test_targets: ["rails:test_mysql2"]
-        ar_version: ["7-0-stable"]
+        ar_version: ["7-1-stable"]
         prepared_statements: ['false', 'true']
         driver: ['MySQL']
 
@@ -45,7 +45,7 @@ jobs:
       JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -79,7 +79,7 @@ jobs:
         ruby-version: [ 'jruby-head' ]
         db: [ 'postgresql' ]
         test_targets: [ "rails:test_postgresql" ]
-        ar_version: ["7-0-stable"]
+        ar_version: ["7-1-stable"]
         prepared_statements: [ 'false', 'true' ]
 
     services:
@@ -102,7 +102,7 @@ jobs:
       PGUSER: postgres
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -129,7 +129,7 @@ jobs:
         ruby-version: ['jruby-head']
         db: ['sqlite3']
         test_targets: ["rails:test_sqlite3"]
-        ar_version: ["7-0-stable"]
+        ar_version: ["7-1-stable", "main"]
 
     env:
       DB: ${{ matrix.db }}
@@ -137,7 +137,7 @@ jobs:
       JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -179,7 +179,7 @@ jobs:
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -230,7 +230,7 @@ jobs:
       PGUSER: postgres
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -256,10 +256,10 @@ jobs:
 
     env:
       DB: ${{ matrix.db }}
-      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.gitignore

@@ -15,6 +15,7 @@ coverage
 build.xml
 nbproject
 .classpath
+.ruby-version
 .project
 *.sqlite
 *.sqlite3

data/.solargraph.yml

@@ -0,0 +1,15 @@
+---
+include:
+- "**/*.rb"
+exclude:
+- spec/**/*
+- test/**/*
+- vendor/**/*
+- ".bundle/**/*"
+require: []
+domains: []
+reporters:
+- rubocop
+- require_not_found
+require_paths: []
+max_files: 5000

data/Gemfile

@@ -34,17 +34,24 @@ elsif ENV['AR_VERSION'] # Use specific version of AR and not .gemspec version
         opts = {branch: version}
       end
 
-      git 'https://github.com/rails/rails.git', **opts do
+      git 'https://github.com/JesseChavez/rails.git', **opts do
         gem 'activerecord', require: false
         gem 'activemodel', require: false
         gem 'activesupport', require: false
         gem 'actionpack', require: false
         gem 'actionview', require: false
       end
+      
     end
   end
 else
-  gemspec name: 'activerecord-jdbc-alt-adapter' # Use versiom from .gemspec
+  if defined? JRUBY_VERSION
+    gemspec name: 'activerecord-jdbc-alt-adapter' # Use versiom from .gemspec
+  else # read add_dependency 'activerecord', '~> 7.0' and use the same requirement on MRI
+    ar_req = File.read('activerecord-jdbc-adapter.gemspec').match(/add_dependency.*?activerecord.*['"](.*?)['"]/)[1]
+    raise "add_dependency 'activerecord', ... line not detected in gemspec" unless ar_req
+    gem 'activerecord', ar_req
+  end
 end
 
 gem 'rake', require: nil
@@ -72,6 +79,10 @@ group :rails do
   gem 'builder', require: nil
 
   gem 'erubis', require: nil # "~> 2.7.0"
+
+  # Due to rails/activesupport/lib/active_support/message_pack.rb
+  gem 'msgpack', '>= 1.7.0', require: false
+
   # NOTE: due rails/activerecord/test/cases/connection_management_test.rb
   gem 'rack', require: nil
 
@@ -79,7 +90,7 @@ group :rails do
 end
 
 group :development do
-  gem 'ruby-debug', require: nil # if ENV['DEBUG']
+  #gem 'ruby-debug', require: nil # if ENV['DEBUG']
   group :doc do
     gem 'yard', require: nil
     gem 'kramdown', require: nil
@@ -94,10 +105,12 @@ group :test do
 
   gem 'mysql2', '>= 0.4.4', require: nil, platform: :mri
   gem 'pg', '>= 0.18.0', require: nil, platform: :mri
-  gem 'sqlite3', '~> 1.3.6', require: nil, platform: :mri
+  gem 'sqlite3', '~> 1.4', require: nil, platform: :mri
 
   # group :mssql do
   #   gem 'tiny_tds', require: nil, platform: :mri
   #   gem 'activerecord-sqlserver-adapter', require: nil, platform: :mri
   # end
 end
+
+gem 'pry-nav'

data/README.md

@@ -143,10 +143,14 @@ Versions are targeted at certain versions of Rails and live on their own branche
 | 51.x        | 5.1.x         | 51-stable | 9.1.x     | 7        |
 | 52.x        | 5.2.x         | 52-stable | 9.1.x     | 7        |
 | 60.x        | 6.0.x         | 60-stable | 9.2.7     | 8        |
-| 61.x        | 6.1.x         | master    | 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        |
 
-Note that JRuby 9.1.x is end-of-life. We recommend Java 8 at a minimum for all
-versions.
+Note: 71.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.
 
 ## Using ActiveRecord JDBC
 

data/RUNNING_TESTS.md

@@ -16,6 +16,8 @@ Rake tasks are loaded from **rakelib/02-test-rake**, most adapters have a
 corresponding test_[adapter] task e.g. `rake test_sqlite3` that run against DB.
 To check all available (test related) tasks simply `rake -T | grep test`.
 
+### Database Setup
+
 If the adapter supports creating a database it will try to do so automatically
 (most embed databases such as SQLite3) for some adapters (MySQL, PostgreSQL) we
 do this auto-magically (see the `rake db:create` tasks), but otherwise you'll
@@ -48,6 +50,40 @@ but one can easily run tests with prepared statements disabled using env vars :
 
     rake test_derby PREPARED_STATEMENTS=false
 
+#### MySQL with Docker
+
+The standard Docker MySQL image can be used for testing and development. Depending on your environment these commands
+may need to be run as root.
+
+Pull the image:
+
+```
+sudo docker pull mysql
+```
+
+Start up the database with a root password (we show a simple one here but pick one no one else knows):
+
+```
+docker run -p 3306:3306 --name mysql -e MYSQL_ROOT_PASSWORD=testtest9 -d mysql
+```
+
+The `mysql` client can be run through Docker as well:
+
+```sh
+docker run -it --link mysql:mysql --rm mysql sh -c 'exec mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD"'
+```
+
+Set up the database for the unit tests (you may need to replace 'localhost' with your container's IP):
+
+```sql
+CREATE USER 'rails'@'localhost' IDENTIFIED BY 'testtest9';
+CREATE DATABASE activerecord_unittest;
+GRANT ALL PRIVILEGES ON activerecord_unittest.* TO 'rails'@'localhost';
+CREATE DATABASE activerecord_unittest2;
+GRANT ALL PRIVILEGES ON activerecord_unittest2.* TO 'rails'@'localhost';
+```
+
+Then edit test/rails/config.yml for the appropriate configuration credentials.
 
 ### ActiveRecord (Rails) Tests
 

data/activerecord-jdbc-adapter.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
     "AR-JDBC is a database adapter for Rails' ActiveRecord component " <<
     "designed to be used with JRuby built upon Java's JDBC API for " <<
     "database access. Provides (ActiveRecord) built-in adapters: MySQL,  " <<
-    "PostgreSQL, SQLite3, and SQLServer."
+    "PostgreSQL, and SQLite3."
 
   gem.require_paths = ["lib"]
 
@@ -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.0'
+  gem.add_dependency 'activerecord', '~> 7.1.0'
 
   #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.0.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

@@ -51,6 +51,16 @@ module Arel
         end
       end
 
+      # Override the default in arel ToSql class
+      def visit_Arel_Nodes_NullsFirst(o, collector)
+        visit o.expr, collector
+      end
+
+      # Override the default in arel ToSql class
+      def visit_Arel_Nodes_NullsLast(o, collector)
+        visit o.expr, collector
+      end
+
       def visit_Arel_Nodes_Grouping(o, collector)
         remove_invalid_ordering_from_select_statement(o.expr)
         super

data/lib/arjdbc/abstract/connection_management.rb

@@ -6,29 +6,28 @@ module ArJdbc
 
       # @override
       def active?
-        return unless @connection
-        @connection.active?
+        @raw_connection&.active?
       end
 
       def really_valid?
-        return unless @connection
-        @connection.really_valid?
+        @raw_connection&.really_valid?
       end
 
       # @override
-      def reconnect!
-        super # clear_cache! && reset_transaction
-        @connection.reconnect! # handles adapter.configure_connection
-      end
+      # Removed to fix sqlite adapter, may be needed for others
+      # def reconnect!
+      #   super # clear_cache! && reset_transaction
+      #   @connection.reconnect! # handles adapter.configure_connection
+      # end
 
       # @override
       def disconnect!
         super # clear_cache! && reset_transaction
-        return unless @connection
-        @connection.disconnect!
+        @raw_connection&.disconnect!
       end
 
       # @override
+      # Removed to fix sqlite adapter, may be needed for others
       # def verify!(*ignored)
       #  if @connection && @connection.jndi?
       #    # checkout call-back does #reconnect!
@@ -37,6 +36,20 @@ module ArJdbc
       #  end
       # end
 
+      # 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
+      end
+
+      def reconnect
+        if active?
+          @raw_connection.rollback rescue nil
+        else
+          connect
+        end
+      end
+
     end
   end
 end

data/lib/arjdbc/abstract/core.rb

@@ -9,7 +9,7 @@ module ArJdbc
 
       attr_reader :config
 
-      def initialize(connection, logger = nil, config = {})
+      def initialize(config)
         @config = config
 
         if self.class.equal? ActiveRecord::ConnectionAdapters::JdbcAdapter
@@ -18,11 +18,7 @@ module ArJdbc
           extend spec if spec
         end
 
-        connection ||= jdbc_connection_class(config[:adapter_spec]).new(config, self)
-
-        super(connection, logger, config) # AbstractAdapter
-
-        connection.configure_connection # will call us (maybe)
+        super(config) # AbstractAdapter
       end
 
       # Retrieve the raw `java.sql.Connection` object.
@@ -56,6 +52,9 @@ module ArJdbc
         # swallow an ArJdbc / driver bug into an AR::StatementInvalid !
         return exception if exception.is_a?(Throwable)
 
+        # We create this exception in Java where we do not have access to the pool
+        exception.instance_variable_set(:@connection_pool, @pool) if exception.kind_of?(::ActiveRecord::JDBCError)
+
         case exception
           when SystemExit, SignalException, NoMemoryError then exception
           when ActiveModel::RangeError, TypeError, RuntimeError then exception