activerecord-jdbc-alt-adapter 61.3.0-java → 70.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 781349fe765b4a4f4120f56bffc438f5b0aed6c88eace2e2c0d06ae9f0c2e74e
-  data.tar.gz: 26e984b439b7525c5952aaf30890f05463e6e0f0d56e350a9cd2ec201e32ebfb
+  metadata.gz: 92f8a9759858e84a83dfcba88e6d636e15fde2fd4b3e3f803468285c689046c7
+  data.tar.gz: ed1afe9af104349e17c78c419cb57acf875df4385747c2dbc05fcca1a2d7454e
 SHA512:
-  metadata.gz: aa7e6244bfbc98507d72bae0e5efd93c2da6bf7375e740d59bbdaf58cfa5908766e3a0e778fc1d2ac04508b19b7c70a54d69d7a701f5e26f19e54fca41ccb104
-  data.tar.gz: 0b3c681b353c0ec8cdaf45744cfba2684d989e38aef4bd501b198c91bf005c48df4f5efc9e3478ef6229ff082dad08e07dd701f1d81e644b527fff883adfe237
+  metadata.gz: 1758438f64620af7a292ad7474a8eaa0757dba8666a0051e3ab3e917a548d856bb69938d6a2730ee8b91b1cbd70f3df632da3fb50d450c98ae429994cf98ddc1
+  data.tar.gz: 41e2acd357484e61e4388078515f434d0098601764f67465a3d984bb0205b885c08bbff0918140568749a7fa1516d70bfd1cd9b3e8cae29e82999729e90502cf

data/.github/workflows/main.yml

@@ -0,0 +1,166 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Tests
+
+on:
+  push:
+    branches: [ stable-dev ]
+  pull_request:
+    branches: [ stable-dev ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  test-arjdbc-mssql:
+
+    name: ARJDBC Tests (mssql)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['jruby-9.4.2.0']
+        db: ['mssql']
+        test_targets: ['test_mssql']
+
+    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 }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      SQLUSER: SA
+      SQLPASS: Password12!
+
+    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: Setup database
+        run: /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "Password12!" -Q "CREATE DATABASE arjdbc_test;"
+      - name: Build
+        run: |
+          rake 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.2.0' ]
+        db: [ 'postgresql' ]
+        test_targets: [ "rails:test_postgresql" ]
+        ar_version: ["7-0-stable"]
+        prepared_statements: [ 'false', 'true' ]
+
+    services:
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_HOST_AUTH_METHOD: trust
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    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"
+      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: Setup database
+        run: |
+          psql -c "create database activerecord_unittest;" -U postgres
+          psql -c "create database activerecord_unittest2;" -U postgres
+      - name: Build
+        run: |
+          rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.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.2.0']
+        db: ['postgresql']
+        test_targets: ["db:postgresql test_postgresql"]
+        prepared_statements: ['false', 'true']
+        insert_returning: ['false', 'true']
+
+    services:
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_HOST_AUTH_METHOD: trust
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    env:
+      DB: ${{ matrix.db }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
+      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 }}

data/.github/workflows/ruby.yml

@@ -0,0 +1,273 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  test-rails-mysql:
+
+    name: Rails Tests (MySQL)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['jruby-head']
+        db: ['mysql2']
+        test_targets: ["rails:test_mysql2"]
+        ar_version: ["7-0-stable"]
+        prepared_statements: ['false', 'true']
+        driver: ['MySQL']
+
+    services:
+      mysql:
+        image: mysql:5.7
+        ports:
+          - 3306
+
+    env:
+      DB: ${{ matrix.db }}
+      AR_VERSION: ${{ matrix.ar_version }}
+      PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
+      DRIVER: ${{ matrix.driver }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+
+    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: Setup database
+        run: |
+          sudo service mysql start
+          mysql --version || true # to see if we're using MySQL or MariaDB
+          mysql -u root -proot -e "CREATE USER rails@localhost;"
+          mysql -u root -proot -e "grant all privileges on activerecord_unittest.* to rails@localhost;"
+          mysql -u root -proot -e "grant all privileges on activerecord_unittest2.* to rails@localhost;"
+          mysql -u root -proot -e "grant all privileges on inexistent_activerecord_unittest.* to rails@localhost;"
+          mysql -u root -proot -e "CREATE DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8mb4;"
+          mysql -u root -proot -e "CREATE DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8mb4;"
+      - 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-head' ]
+        db: [ 'postgresql' ]
+        test_targets: [ "rails:test_postgresql" ]
+        ar_version: ["7-0-stable"]
+        prepared_statements: [ 'false', 'true' ]
+
+    services:
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_HOST_AUTH_METHOD: trust
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    env:
+      DB: ${{ matrix.db }}
+      AR_VERSION: ${{ matrix.ar_version }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
+      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: Setup database
+        run: |
+          psql -c "create database activerecord_unittest;" -U postgres
+          psql -c "create database activerecord_unittest2;" -U postgres
+      - name: Build
+        run: |
+          rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
+      - name: Run tests
+        run: |
+          bundle exec rake ${{ matrix.test_targets }}
+
+  test-rails-sqlite:
+
+    name: Rails Tests (SQLite)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['jruby-head']
+        db: ['sqlite3']
+        test_targets: ["rails:test_sqlite3"]
+        ar_version: ["7-0-stable"]
+
+    env:
+      DB: ${{ matrix.db }}
+      AR_VERSION: ${{ matrix.ar_version }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+
+    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: |
+          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-arjdbc-mysql:
+
+    name: ARJDBC Tests (MySQL)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['jruby-head']
+        db: ['mysql2']
+        test_targets: ["db:mysql test_mysql2"]
+        prepared_statements: ['false', 'true']
+        driver: ['MySQL']
+
+    services:
+      mysql:
+        image: mysql:5.7
+        ports:
+          - 3306
+
+    env:
+      DB: ${{ matrix.db }}
+      DRIVER: ${{ matrix.driver }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      MY_USER: root
+      MY_PASSWORD: root
+      PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
+
+    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: Setup database
+        run: |
+          sudo service mysql start
+          mysql --version || true # to see if we're using MySQL or MariaDB
+      - 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-head']
+        db: ['postgresql']
+        test_targets: ["db:postgresql test_postgresql"]
+        prepared_statements: ['false', 'true']
+        insert_returning: ['false', 'true']
+
+    services:
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_HOST_AUTH_METHOD: trust
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    env:
+      DB: ${{ matrix.db }}
+      DRIVER: ${{ matrix.driver }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
+      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-arjdbc-sqlite:
+
+    name: ARJDBC Tests (SQLite)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['jruby-head']
+        db: ['sqlite3']
+        test_targets: ['test_sqlite3']
+
+    env:
+      DB: ${{ matrix.db }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+
+    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 }}

data/.gitignore

@@ -36,3 +36,4 @@ lib/arjdbc/jdbc/adapter_java.jar
 tags
 pik.sh
 .ruby-version
+.rubocop.yml

data/.travis.yml

@@ -9,14 +9,13 @@ before_install:
   - rvm @default,@global do gem uninstall bundler -a -x -I || true
   - gem install bundler -v "~>1.17.3"
 install:
-- bundle config set --local without 'development'
-- bundle install
+- bundle install --retry 3 --without development
 # to fix this issue: https://travis-ci.community/t/mariadb-10-1-fails-to-install-on-xenial/3151/3
 - mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;' || true
 
 language: ruby
 rvm:
-  - jruby-9.2.19.0
+  - jruby-9.2.14.0
 jdk:
   - openjdk8
 
@@ -49,7 +48,7 @@ before_script:
 
 env:
   global:
-    - AR_VERSION="6-1-stable"
+    - AR_VERSION="master"
 matrix:
   allow_failures:
     - rvm: jruby-head

data/Gemfile

@@ -44,10 +44,10 @@ elsif ENV['AR_VERSION'] # Use specific version of AR and not .gemspec version
     end
   end
 else
-  gemspec name: 'activerecord-jdbc-adapter' # Use versiom from .gemspec
+  gemspec name: 'activerecord-jdbc-alt-adapter' # Use versiom from .gemspec
 end
 
-gem 'rake', '>= 11.1', require: nil
+gem 'rake', require: nil
 
 group :test do
   gem 'test-unit', require: nil
@@ -55,7 +55,7 @@ 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.0', require: nil
+  gem 'jdbc-mssql', '~> 12.2', require: nil
   # gem 'pry-debugger-jruby', platform: :jruby
 end
 
@@ -74,6 +74,8 @@ group :rails do
   gem 'erubis', require: nil # "~> 2.7.0"
   # NOTE: due rails/activerecord/test/cases/connection_management_test.rb
   gem 'rack', require: nil
+
+  gem 'zeitwerk'
 end
 
 group :development do

data/README.md

@@ -15,6 +15,7 @@ stable of this adapter and Rails
 | 52.6.0      | 5.2.4         | 9.1.x     |
 | 60.1.0      | 6.0.3         | 9.2.9     |
 | 61.0.0      | 6.1.3         | 9.2.16    |
+| 70.0.0      | 7.0.4         | 9.4.1.0   |
 
 This adapter passes most of the Rails tests (ActiveRecord tests) with the
 exception of some test that are not compatible with the SQL Server. To run
@@ -29,13 +30,16 @@ Add the following to your `Gemfile`:
 ```ruby
 platforms :jruby do
   # Use jdbc as the database for Active Record
-  gem 'activerecord-jdbc-alt-adapter', '~> 61.0.0'
+  gem 'activerecord-jdbc-alt-adapter', '~> 70.0.0.rc1'
   gem 'jdbc-mssql', '~> 0.9.0'
 end
 ```
 
 Or look at the sample rails and see how is set up:
 
+
+- Rails 7.0 sample app [wombat70](https://github.com/JesseChavez/wombat70)
+
 - Rails 6.1 sample app [wombat61](https://github.com/JesseChavez/wombat61)
 
 - Rails 6.0 sample app [wombat60](https://github.com/JesseChavez/wombat60)

data/Rakefile

@@ -26,7 +26,7 @@
 
 require 'rake/clean'
 
-CLEAN.include 'derby*', 'test.db.*', '*test.sqlite3', 'test/reports'
+CLEAN.include 'test.db.*', '*test.sqlite3', 'test/reports'
 CLEAN.include 'lib/**/*.jar', 'MANIFEST.MF', '*.log', 'target/*'
 
 task :default => :jar # RubyGems extention will do a bare `rake' e.g. :

data/activerecord-jdbc-adapter.gemspec

@@ -41,12 +41,12 @@ 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', '~> 6.1.0'
+  gem.add_dependency 'activerecord', '~> 7.0'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'
   #gem.add_development_dependency 'mocha', '~> 0.13.1'
 
-  gem.rdoc_options = ["--main", "README.md", "-SHN", "-f", "darkfish"]
+  gem.rdoc_options = ["--main", "README.md"]
 end
 

data/activerecord-jdbc-alt-adapter.gemspec

@@ -43,12 +43,12 @@ 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', '~> 6.1.0'
+  gem.add_dependency 'activerecord', '~> 7.0.0'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'
   #gem.add_development_dependency 'mocha', '~> 0.13.1'
 
-  gem.rdoc_options = ["--main", "README.md", "-HN", "-f", "darkfish"]
+  gem.rdoc_options = ["--main", "README.md"]
 end
 

data/lib/arel/visitors/compat.rb

@@ -4,44 +4,16 @@ module Arel
 
       protected
 
-      if ToSql.instance_method('visit').arity == 1
-        def do_visit(x, a); visit(x); end # a = nil
-      else # > AREL 4.0
-        def do_visit(x, a); visit(x, a); end
-      end
+      def do_visit(x, a); visit(x, a); end
 
-      if ToSql.instance_method('visit_Arel_Nodes_SelectCore').arity == 1
-        def do_visit_select_core(x, a) # a = nil
-          visit_Arel_Nodes_SelectCore(x)
-        end
-      else # > AREL 4.0
-        def do_visit_select_core(x, a)
-          visit_Arel_Nodes_SelectCore(x, a)
-        end
+      def do_visit_select_core(x, a)
+        visit_Arel_Nodes_SelectCore(x, a)
       end
 
       private
 
-      if ArJdbc::AR42
-        if Arel::VERSION < '6.0.2'
-          def limit_for(limit_or_node)
-            if limit_or_node.respond_to?(:expr)
-              expr = limit_or_node.expr
-              # NOTE(uwe): Different behavior for Arel 6.0.0 and 6.0.2
-              expr.respond_to?(:value) ? expr.value.to_i : expr.to_i
-            else
-              limit_or_node
-            end
-          end
-        else
-          def limit_for(limit_or_node)
-            limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
-          end
-        end
-      else
-        def limit_for(limit_or_node)
-          limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
-        end
+      def limit_for(limit_or_node)
+        limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
       end
       module_function :limit_for
 

data/lib/arel/visitors/h2.rb

@@ -7,19 +7,7 @@ module Arel
       def visit_Arel_Nodes_SelectStatement(o, *)
         o.limit ||= Arel::Nodes::Limit.new(-1) if o.offset
         super
-      end if ArJdbc::AR42
-
-      def limit_offset sql, o
-        offset = o.offset || 0
-        offset = offset.expr unless (offset.nil? || offset == 0)
-        if limit = o.limit
-          "SELECT LIMIT #{offset} #{limit_for(limit)} #{sql[7..-1]}"
-        elsif offset > 0
-          "SELECT LIMIT #{offset} -1 #{sql[7..-1]}" # removes "SELECT "
-        else
-          sql
-        end
-      end unless ArJdbc::AR42
+      end
     end
   end
 end

data/lib/arel/visitors/hsqldb.rb

@@ -6,27 +6,7 @@ module Arel
       def visit_Arel_Nodes_SelectStatement(o, *)
         o.limit ||= Arel::Nodes::Limit.new(0) if o.offset
         super
-      end if ArJdbc::AR42
-
-      def visit_Arel_Nodes_SelectStatement o, a = nil
-        sql = limit_offset(o.cores.map { |x| do_visit_select_core x, a }.join, o)
-        sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
-        sql
-      end unless ArJdbc::AR42
-
-      private
-
-      def limit_offset sql, o
-        offset = o.offset || 0
-        offset = offset.expr unless (offset.nil? || offset == 0)
-        if limit = o.limit
-          "SELECT LIMIT #{offset} #{limit_for(limit)} #{sql[7..-1]}"
-        elsif offset > 0
-          "SELECT LIMIT #{offset} 0 #{sql[7..-1]}" # removes "SELECT "
-        else
-          sql
-        end
-      end unless ArJdbc::AR42
+      end
     end
   end
 end