activerecord-jdbc-adapter 72.1-java → 80.0.pre1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 432e362b96d8dd8bfddc15440173de01d54d869ef32c4fca6488dc323d83decb
-  data.tar.gz: 6a7a7262d2ca6169b7decc7afb510f9cbdab1f7648c507c7e72f6b10e8a2da1d
+  metadata.gz: 126f20bb7b8403ad8a284fd75f73d0141039f68f10e3488a0be36da6e31d1307
+  data.tar.gz: '09f8725e1f8a28d4b9cb8e01a4fb07f419727ec9dfc561740ec52e2b56b6e2dd'
 SHA512:
-  metadata.gz: 6e9c5208cbe6d46ae007063a3e37df970492c2133fdf59e414ac7f341a7e82c926cdc95b48f5b81c43bf01885efb5bb11fd4d7d09d7d68eab94dcda893cc2664
-  data.tar.gz: 33e36e3c845bdd0f2e953f25eb6080f06e3a91caf616b9f86b1b19fd1498e1bfd9edefeb55c80c0d7335645b955efc1da42631298e427e1dbf91add71cd70566
+  metadata.gz: 1615999867c54b179d94ab833100320af6c6b3be80a3a1f1991ab2efb4cb1c586818b6d0b88a3e1103be50bfa357feb52551543a0be1e81b43d8e6b47d90039e
+  data.tar.gz: 17bef2d1991fb4eeb5fd53011e16dba1ce5056742fb82311bddd31455d99de20d70b9fb3a43fac0b35e547827f100b1d12f369a916a1461bf82a5c911a3b531a

data/.github/workflows/ruby.yml

@@ -7,11 +7,7 @@
 
 name: Ruby
 
-on:
-  push:
-    branches: [ master, 72-stable ]
-  pull_request:
-    branches: [ master, 72-stable ]
+on: [push, pull_request]
 
 permissions:
   contents: read
@@ -24,16 +20,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.14.0']
+        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
@@ -76,18 +80,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ 'jruby-9.4.14.0' ]
+        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
@@ -126,10 +149,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.14.0']
+        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"
@@ -158,7 +189,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.14.0']
+        ruby-version: ['jruby-head']
         db: ['mysql2']
         test_targets: ["db:mysql test_mysql2"]
         prepared_statements: ['false', 'true']
@@ -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:
@@ -203,7 +239,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.14.0']
+        ruby-version: ['jruby-head']
         db: ['postgresql']
         test_targets: ["db:postgresql test_postgresql"]
         prepared_statements: ['false', 'true']
@@ -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
@@ -250,7 +306,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.4.14.0']
+        ruby-version: ['jruby-head']
         db: ['sqlite3']
         test_targets: ['test_sqlite3']
 
@@ -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,74 +42,68 @@ 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-adapter' # Use versiom from .gemspec
-  else # read add_dependency 'activerecord', '~> 7.0' and use the same requirement on MRI
+    gemspec name: 'activerecord-jdbc-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
 
-group :test do
-  gem 'test-unit', require: nil
-  gem 'test-unit-context', require: nil
-  gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
-
-  gem 'bcrypt', '~> 3.1.11', require: false
-end
-
-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?)
-  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
-
-  gem 'zeitwerk'
-end
-
+# Development Dependencies
 group :development do
-  #gem 'ruby-debug', require: nil # if ENV['DEBUG']
+  gem 'pry-nav'
+  
   group :doc do
     gem 'yard', require: nil
     gem 'kramdown', require: nil
   end
 end
 
+# Test Dependencies
 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
+  # Core testing gems
+  gem 'test-unit', require: nil
+  gem 'test-unit-context', require: nil
+  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
+    if sqlite_version = ENV['JDBC_SQLITE_VERSION']
+      gem 'jdbc-sqlite3', sqlite_version, require: nil
+    end
+  end
+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
+# Rails-specific test dependencies
+group :rails do
+  # Rails testing and support gems
+  gem 'builder', require: nil
+  gem 'erubis', require: nil
+  gem 'msgpack', '~> 1.7', require: false
+  gem 'rack', require: nil
+  gem 'zeitwerk'
 
-  # group :mssql do
-  #   gem 'tiny_tds', require: nil, platform: :mri
-  #   gem 'activerecord-sqlserver-adapter', require: nil, platform: :mri
-  # end
+  group :test do
+    gem 'minitest-excludes', require: nil
+    gem 'minitest-rg', require: nil
+    gem 'minitest-rails', require: nil
+    gem 'benchmark-ips', require: nil
+  end
 end
-
-gem 'pry-nav'

data/README.md

@@ -27,9 +27,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/Rakefile

@@ -5,6 +5,21 @@
 #
 # Environment variables used by this Rakefile:
 #
+# DBS
+#   Limits the command performed to only work for one of the database
+#   types listed in this env var. You can set to a combination of mysql, 
+#   postgres, or sqlite, separated by commas. For example:
+#
+#    mysql,postgres,sqlite
+#
+#    You may use pg or postgres as aliases for postgresql
+#    You may use sqlite3 as an alias for sqlite
+#    You may use all to mean all three
+#
+#    NOTE: if you ever want to add a new type of database to be released,
+#          just fix up this documentation, the error string in invalid_dbs,
+#          and add it to the ALL_DBS array. Everything else should just work!
+#
 # INCLUDE_JAR_IN_GEM [default task - false, other taks - true]:
 #   Note: This is something you should not normally have to set.
 #   For local development we always will end up including the jar file
@@ -85,6 +100,12 @@ end
 
 desc "Releasing AR-JDBC gems (use NOOP=true to disable gem pushing)"
 task 'release:do' do
+  unless ENV["DBS"]
+    puts "you must explicitly provide a DBS env var when calling release:do. An empty one will not default to 'all' " \
+           "for this command\n\n"
+    invalid_dbs!
+  end
+
   Rake::Task['build'].invoke
   Rake::Task['build:adapters'].invoke
 
@@ -107,8 +128,41 @@ task 'release:push' do
   sh "for gem in `ls pkg/*-#{current_version.call}-java.gem`; do gem push $gem; done"
 end
 
-ADAPTERS = %w[mysql postgresql sqlite3].map { |a| "activerecord-jdbc#{a}-adapter" }
-DRIVERS  = %w[mysql postgres sqlite3].map { |a| "jdbc-#{a}" }
+ALL_DBS = ["mysql", "postgresql", "sqlite3"]  #NOTE: if we add a new database type to be released, just add it here!
+DB_ALIASES = ALL_DBS.map {|db| [db, db]}.to_h.merge({
+  "pg" => "postgresql",
+  "postgres" => "postgresql",
+  "sqlite" => "sqlite3"
+})
+
+def invalid_dbs!
+  raise ArgumentError, "Invalid DBS env var\nThe DBS env var must be set to a combination of mysql, postgres, or " \
+                       "sqlite, separated by commas. For example:\n\nmysql,postgres,sqlite\n\nYou may use pg or " \
+                       "postgres as aliases for postgresql\nYou may use sqlite3 as an alias for sqlite\n" \
+                       "You may use all as a shortcut to listing them all out"
+end
+
+def make_db_list
+  env_dbs = ENV["DBS"]
+  return ALL_DBS if !env_dbs || env_dbs == "all"
+  requested = env_dbs.split(",").map(&:strip).reject(&:empty?).map(&:downcase)
+  invalid_dbs! unless requested.size > 0 && requested == requested.uniq
+
+  canonical = requested.map do |name|
+    DB_ALIASES.fetch(name) { invalid_dbs! }
+  end
+
+  invalid_dbs! unless canonical == canonical.uniq
+
+  canonical
+end
+
+db_list = make_db_list
+ADAPTERS = db_list.map { |db| "activerecord-jdbc#{db}-adapter" }
+
+db_list.map! {|db| db == 'postgresql' ? 'postgres' : db  }  #naming convention for DRIVERS
+DRIVERS  = db_list.map { |a| "jdbc-#{a}" }
+
 TARGETS = ( ADAPTERS + DRIVERS )
 
 ADAPTERS.each do |target|
@@ -185,7 +239,7 @@ if defined? JRUBY_VERSION
   #directory classes = 'pkg/classes'; CLEAN << classes
 
   file jar_file => FileList[ 'src/java/**/*.java' ] do
-    source = target = '1.8'; debug = true
+    source = target = '21'; debug = true
 
     get_driver_jars_local = lambda do |*args|
       driver_deps = args.empty? ? [ :Postgres, :MySQL ] : args
@@ -262,18 +316,12 @@ if defined? JRUBY_VERSION
     end
 
     classpath = []
-    [ 'java.class.path', 'sun.boot.class.path' ].map { |key| ENV_JAVA[key] }.each do |v|
-      classpath += v.split(File::PATH_SEPARATOR).find_all { |jar| jar =~ /jruby/i } if v
-    end
-    # Using Java 9+.  Let's try and infer jruby.jar location from rbconfig
-    if classpath.empty?; require 'rbconfig'
-      libdir = RbConfig::CONFIG['libdir']
-      if libdir.start_with? 'classpath:'
-        error "Cannot build activerecord-jdbc with jruby-complete"
-      end
-      classpath << File.join(libdir, 'jruby.jar')
+    require 'rbconfig'
+    libdir = RbConfig::CONFIG['libdir']
+    if libdir.start_with? 'classpath:'
+      error "Cannot build activerecord-jdbc with jruby-complete"
     end
-    
+    classpath << File.join(libdir, 'jruby.jar')
     classpath += driver_jars
     classpath = classpath.compact.join(File::PATH_SEPARATOR)
 

data/activerecord-jdbc-adapter.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.homepage = 'https://github.com/jruby/activerecord-jdbc-adapter'
   gem.license = 'BSD-2-Clause'
   gem.summary = 'JDBC adapter for ActiveRecord, for use within JRuby on Rails.'
-  gem.description = "" <<
+  gem.description = +"" <<
     "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,  " <<
@@ -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.2.2"
+  gem.add_dependency "activerecord", "~> 8.0.0"
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arjdbc/abstract/core.rb

@@ -58,7 +58,7 @@ module ArJdbc
       end
 
       # this version of log() automatically fills type_casted_binds from binds if necessary
-      def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil, async: false)
+      def log(sql, name = "SQL", binds = [], type_casted_binds = [], async: false, &block)
         if binds.any? && (type_casted_binds.nil? || type_casted_binds.empty?)
           type_casted_binds = lambda {
             # extract_raw_bind_values

data/lib/arjdbc/abstract/database_statements.rb

@@ -10,8 +10,6 @@ module ArJdbc
       NO_BINDS = [].freeze
 
       def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil, returning: nil)
-        sql = transform_query(sql)
-
         if preventing_writes?
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -34,8 +32,6 @@ 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, 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
@@ -58,8 +54,6 @@ module ArJdbc
       end
 
       def exec_update(sql, name = 'SQL', binds = NO_BINDS)
-        sql = transform_query(sql)
-
         if preventing_writes?
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -86,13 +80,23 @@ module ArJdbc
 
       private
 
+      def without_prepared_statement?(binds)
+        !prepared_statements || binds.empty?
+      end
+
       def convert_legacy_binds_to_attributes(binds)
         binds.map do |column, value|
           ActiveRecord::Relation::QueryAttribute.new(nil, type_cast(value, column), ActiveModel::Type::Value.new)
         end
       end
 
-      def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
+      def preprocess_query(sql)
+        check_if_write_query(sql) if respond_to?(:check_if_write_query, true)
+        mark_transaction_written_if_write(sql) if respond_to?(:mark_transaction_written_if_write, true)
+        sql
+      end
+
+      def raw_execute(sql, name, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)
         log(sql, name, async: async) do
           with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
             result = conn.execute(sql)

data/lib/arjdbc/mysql/adapter_hash_config.rb

@@ -61,8 +61,7 @@ module ArJdbc
 
       properties["connectionCollation"] ||= config[:collation] if config[:collation]
 
-      reconnect = config[:reconnect]
-      properties["autoReconnect"] ||= reconnect.to_s unless reconnect.nil?
+      properties["autoReconnect"] ||= reconnect.to_s unless config[:reconnect].nil?
 
       properties["noDatetimeStringSync"] = true unless properties.key?("noDatetimeStringSync")