activerecord-jdbc-alt-adapter 72.0.0.rc3-java → 80.0.0.rc1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f13e7b4fa08bfb67f978fad2353bd633bd0420848babe30b611949d69667e77
-  data.tar.gz: 35ce8492f5985337a6f2ca02beac9eb38a0a3b9fc5957d816c39bf2da0790687
+  metadata.gz: af1013cc5645ba0826a27708509821f2f209c2a1458a210fb0e08b8c009d97b9
+  data.tar.gz: b359f9f151a47ba7b10f8416a90bec25c09147a56b76957f4c6bf849156a8a3f
 SHA512:
-  metadata.gz: 897405b85f5f90c962ca468c600ec44ca12d3cb0f058be273d9944dc998531e03daebf6f80a0cd8ad9cf7367fa90a7b811e7fc5282fc46a503dd987ef628f1f4
-  data.tar.gz: 6a85da335eaf8ecfd708bc6641ec58c7665bdba75784e57d4c3ee33540c5e7d42904ae87587d00ebb304cebc3e94a0d0bebf3f48e74dc7a41103ca1f22960a42
+  metadata.gz: d05fd360ff0fcd095f5658159d6007b62cb176b30ab43713a6030df3281f18420ec41a781733921075152d3750490af54bcd6dfbe6857c074a727527b4ec67f8
+  data.tar.gz: 0b30b95dd040bb21713d18d9ac3558a30d85b3139d7cd665054a20a2bbedab253e15b85fcb360aaf8f27045683f0507ab2b98805b2c7e8abb03f79b9f0af64b8

data/.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.8.0']
+        ruby-version: ['jruby-10.0.6.0']
         db: ['mssql']
         test_targets: ['test_mssql']
 
@@ -36,18 +36,19 @@ jobs:
     # 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-CU27-ubuntu-20.04
+        image: mcr.microsoft.com/mssql/server:2022-CU26-ubuntu-22.04
         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-cmd="/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P $MSSQL_SA_PASSWORD -l 30 -C -Q 'SELECT 1'"
           --health-start-period 10s
           --health-interval 10s
           --health-timeout 5s
           --health-retries 10
+          --name ci_sqlserver
 
     env:
       DB: ${{ matrix.db }}
@@ -63,7 +64,10 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Setup database
-        run: /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "Password12!" -Q "CREATE DATABASE arjdbc_test;"
+        env:
+          MSSQL_SA_PASSWORD: Password12!
+        run: |
+          docker exec ci_sqlserver /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P $MSSQL_SA_PASSWORD -C -Q "CREATE DATABASE arjdbc_test;"
       - name: Build
         run: |
           rake jar
@@ -78,7 +82,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.8.0']
+        ruby-version: ['jruby-10.0.6.0']
         db: ['sqlite3']
         test_targets: ['test_sqlite3']
 
@@ -107,7 +111,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.8.0']
+        ruby-version: ['jruby-10.0.6.0']
         db: ['postgresql']
         test_targets: ["db:postgresql test_postgresql"]
         prepared_statements: ['false', 'true']
@@ -153,25 +157,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ 'jruby-9.4.8.0' ]
+        ruby-version: [ 'jruby-10.0.6.0' ]
         db: [ 'mssql' ]
         test_targets: [ "rails:test_mssql" ]
-        ar_version: ["7-1-stable-dev"]
+        ar_version: ["8-0-stable-dev"]
 
     services:
       mssql:
-        image: mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04
+        image: mcr.microsoft.com/mssql/server:2022-CU26-ubuntu-22.04
         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-cmd="/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P $MSSQL_SA_PASSWORD -l 30 -C -Q 'SELECT 1'"
           --health-start-period 10s
           --health-interval 10s
           --health-timeout 5s
           --health-retries 10
+          --name ci_sqlserver
 
     env:
       DB: ${{ matrix.db }}
@@ -189,9 +194,11 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Setup database
+        env:
+          MSSQL_SA_PASSWORD: Password12!
         run: |
-          /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;"
+          docker exec ci_sqlserver /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P $MSSQL_SA_PASSWORD -C -Q "CREATE DATABASE jdbc_arunit;"
+          docker exec ci_sqlserver /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P $MSSQL_SA_PASSWORD -C -Q "CREATE DATABASE jdbc_arunit2;"
       - name: Build
         run: |
           rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
@@ -206,10 +213,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.8.0']
+        ruby-version: ['jruby-10.0.6.0']
         db: ['sqlite3']
         test_targets: ["rails:test_sqlite3"]
-        ar_version: ["7-1-stable"]
+        ar_version: ["8-0-stable-dev"]
 
     env:
       DB: ${{ matrix.db }}
@@ -238,10 +245,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ 'jruby-9.4.8.0' ]
+        ruby-version: [ 'jruby-10.0.6.0' ]
         db: [ 'postgresql' ]
         test_targets: [ "rails:test_postgresql" ]
-        ar_version: ["7-1-stable"]
+        ar_version: ["8-0-stable-dev"]
         prepared_statements: [ 'false', 'true' ]
 
     services:

data/.github/workflows/ruby.yml

@@ -7,11 +7,7 @@
 
 name: Ruby
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 permissions:
   contents: read
@@ -27,13 +23,13 @@ jobs:
         ruby-version: ['jruby-head']
         db: ['mysql2']
         test_targets: ["rails:test_mysql2"]
-        ar_version: ["7-2-stable"]
+        ar_version: ["8-0-stable"]
         prepared_statements: ['false', 'true']
         driver: ['MySQL']
 
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8
         ports:
           - 3306
 
@@ -46,11 +42,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - 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: Setup gdiff
+        run: |
+          sudo ln -s /usr/bin/diff /usr/bin/gdiff || true
       - name: Setup database
         run: |
           sudo service mysql start
@@ -79,15 +83,15 @@ jobs:
         ruby-version: [ 'jruby-head' ]
         db: [ 'postgresql' ]
         test_targets: [ "rails:test_postgresql" ]
-        ar_version: ["7-2-stable"]
+        ar_version: ["8-0-stable"]
         prepared_statements: [ 'false', 'true' ]
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:17
         env:
           POSTGRES_PASSWORD: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: postgres
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -99,19 +103,38 @@ jobs:
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
       PGHOST: localhost
       PGPORT: 5432
-      PGUSER: postgres
+      PGUSER: arjdbc
+      PGPASSWORD: arjdbc
 
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - 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: Install PostgreSQL 17 client
+        run: |
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo apt-get update
+          sudo apt-get install -y postgresql-client-17
+      - name: Setup gdiff
+        run: |
+          sudo ln -s /usr/bin/diff /usr/bin/gdiff || true
       - name: Setup database
         run: |
-          psql -c "create database activerecord_unittest;" -U postgres
-          psql -c "create database activerecord_unittest2;" -U postgres
+          PGPASSWORD=postgres psql -h localhost -U postgres -c "CREATE USER arjdbc WITH SUPERUSER CREATEDB LOGIN PASSWORD 'arjdbc';"
+          echo "Testing connection as arjdbc user..."
+          PGPASSWORD=arjdbc psql -h localhost -d postgres -U arjdbc -c '\l'
+          echo "Exit status: $?"
+          PGPASSWORD=arjdbc psql -h localhost -d postgres -c "create database activerecord_unittest;" -U arjdbc
+          PGPASSWORD=arjdbc psql -h localhost -d postgres -c "create database activerecord_unittest2;" -U arjdbc
       - name: Build
         run: |
           rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
@@ -129,7 +152,7 @@ jobs:
         ruby-version: ['jruby-head']
         db: ['sqlite3']
         test_targets: ["rails:test_sqlite3"]
-        ar_version: ["7-2-stable"]
+        ar_version: ["8-0-stable"]
 
     env:
       DB: ${{ matrix.db }}
@@ -138,11 +161,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - 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: Setup gdiff
+        run: |
+          sudo ln -s /usr/bin/diff /usr/bin/gdiff || true
       - name: Build
         run: |
           echo "JAVA_OPTS=$JAVA_OPTS"
@@ -166,7 +197,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8
         ports:
           - 3306
 
@@ -180,6 +211,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -211,10 +247,10 @@ jobs:
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:17
         env:
           POSTGRES_PASSWORD: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: postgres
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -227,15 +263,35 @@ jobs:
       INSERT_RETURNING: ${{ matrix.insert_returning }}
       PGHOST: localhost
       PGPORT: 5432
-      PGUSER: postgres
+      PGUSER: arjdbc
+      PGPASSWORD: arjdbc
 
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - 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: Install PostgreSQL 17 client
+        run: |
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo apt-get update
+          sudo apt-get install -y postgresql-client-17
+      - name: Setup PostgreSQL user
+        run: |
+          PGPASSWORD=postgres psql -h localhost -U postgres -c "CREATE USER arjdbc WITH SUPERUSER CREATEDB LOGIN PASSWORD 'arjdbc';"
+      - name: Test PostgreSQL connection
+        run: |
+          echo "Testing connection as arjdbc user..."
+          PGPASSWORD=arjdbc psql -h localhost -d postgres -U arjdbc -c '\l'
+          echo "Exit status: $?"
       - name: Build
         run: |
           rake jar
@@ -260,6 +316,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -271,3 +332,47 @@ jobs:
       - name: Run tests
         run: |
           bundle exec rake ${{ matrix.test_targets }}
+
+  build-gems:
+
+    name: Build ActiveRecord-JDBC gems
+    runs-on: ubuntu-latest
+
+    env:
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: jruby-10.1
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Build
+        run: |
+          rake build:adapters
+      - name: cache main adapter gem
+        uses: actions/upload-artifact@v7
+        with:
+          path: pkg/activerecord-jdbc-adapter*.gem
+          archive: false
+      - name: cache sqlite3 adapter gem
+        uses: actions/upload-artifact@v7
+        with:
+          path: pkg/activerecord-jdbcsqlite3-adapter*.gem
+          archive: false
+      - name: cache mysql adapter gem
+        uses: actions/upload-artifact@v7
+        with:
+          path: pkg/activerecord-jdbcmysql-adapter*.gem
+          archive: false
+      - name: cache postgresql adapter gem
+        uses: actions/upload-artifact@v7
+        with:
+          path: pkg/activerecord-jdbcpostgresql-adapter*.gem
+          archive: false

data/.mise.toml

@@ -0,0 +1,3 @@
+[tools]
+java = "temurin-21"
+ruby = "jruby-10.0.0.1"

data/Gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
+# Rails Dependencies Configuration
 if ENV['RAILS']  # Use local clone of Rails
   rails_dir = ENV['RAILS']    
   activerecord_dir = ::File.join(rails_dir, 'activerecord')
@@ -41,76 +42,70 @@ elsif ENV['AR_VERSION'] # Use specific version of AR and not .gemspec version
         gem 'actionpack', require: false
         gem 'actionview', require: false
       end
-      
     end
   end
 else
   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
+    gemspec name: 'activerecord-jdbc-alt-adapter' # Use version from .gemspec
+  else # read add_dependency 'activerecord', '~> 8.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
 
+# Core Dependencies
 gem 'rake', require: nil
 
+# Development Dependencies
+group :development do
+  gem 'pry-nav'
+  
+  group :doc do
+    gem 'yard', require: nil
+    gem 'kramdown', require: nil
+  end
+end
+
+# Test Dependencies
 group :test do
+  # Core testing gems
   gem 'test-unit', require: nil
   gem 'test-unit-context', require: nil
-  gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
+  gem 'mocha', '~> 2.0', require: false
+  gem 'bcrypt', '~> 3.1', require: false
+  gem 'ostruct', require: false
+  
+  # Database adapters for MRI
+  platform :mri do
+    gem 'mysql2', '~> 0.5', require: nil
+    gem 'pg', '~> 1.5', require: nil
+    gem 'sqlite3', '~> 2.0', require: nil
+  end
+  
+  # JDBC SQLite version override
+  platform :jruby do
+    gem 'jdbc-mssql', '~> 12.6', require: nil
 
-  gem 'bcrypt', '~> 3.1.11', require: false
-  gem 'jdbc-mssql', '~> 12.6', require: nil
-  # gem 'pry-debugger-jruby', platform: :jruby
+    if sqlite_version = ENV['JDBC_SQLITE_VERSION']
+      gem 'jdbc-sqlite3', sqlite_version, require: nil
+    end
+  end
 end
 
+# Rails-specific test dependencies
 group :rails do
-  group :test do
-    gem 'minitest', '~> 5.24.0', require: nil
-    gem 'minitest-excludes', require: nil
-    gem 'minitest-rg', require: nil
-
-    gem 'benchmark-ips', require: nil
-  end
-
-  # AR expects this for testing xml in postgres (maybe others?)
+  # Rails testing and support gems
   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 'erubis', require: nil
+  gem 'msgpack', '~> 1.7', require: false
   gem 'rack', require: nil
-
   gem 'zeitwerk'
-end
-
-group :development do
-  #gem 'ruby-debug', require: nil # if ENV['DEBUG']
-  group :doc do
-    gem 'yard', require: nil
-    gem 'kramdown', require: nil
-  end
-end
 
-group :test do
-  # for testing against different version(s)
-  if sqlite_version = ENV['JDBC_SQLITE_VERSION'] 
-    gem 'jdbc-sqlite3', sqlite_version, require: nil, platform: :jruby
+  group :test do
+    gem 'minitest-excludes', require: nil
+    gem 'minitest-rg', require: nil
+    gem 'minitest-rails', require: nil
+    gem 'benchmark-ips', require: nil
   end
-
-  gem 'mysql2', '>= 0.4.4', require: nil, platform: :mri
-  gem 'pg', '>= 0.18.0', 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

@@ -146,9 +146,10 @@ Versions are targeted at certain versions of Rails and live on their own branche
 | 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         | 71-stable | 9.4.3     | 8        |
-| 72.x        | 7.2.x         | master    | 9.4.3     | 8        |
+| 72.x        | 7.2.x         | 72-stable | 9.4.3     | 8        |
+| 80.x        | 8.0.x         | master    | 10.0.0    | 21       |
 
-Note: 72.x is still under development and not supported yet.
+Note: 80.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/RUNNING_TESTS.md

@@ -83,7 +83,15 @@ CREATE DATABASE activerecord_unittest2;
 GRANT ALL PRIVILEGES ON activerecord_unittest2.* TO 'rails'@'localhost';
 ```
 
-Then edit test/rails/config.yml for the appropriate configuration credentials.
+Then edit test/rails/config.yml for the appropriate configuration credentials. You may need to add a "password: testtest9" entry to authenticate.
+
+Additionally, you may need to add the following to the config.yml file to disable SSL and allow public key retrieval:
+
+```yaml
+      properties:
+        useSSL: false
+        allowPublicKeyRetrieval: true
+```
 
 ### ActiveRecord (Rails) Tests