activerecord-jdbc-adapter 52.7-java → 60.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e10da6d252a05adeedfb0b57fbd49bb6e2b8af28df60c5005adada50ea29bc4
-  data.tar.gz: 18a6f90b2c900b81e9e820e7c79f6478697baa3114ebc3938d67caceacc04e79
+  metadata.gz: 807d5401be5ff0aba3877e221cd597609d8b88b7388cd2bde43861565b3e008c
+  data.tar.gz: ac01cd946ad85a3c4b854d198408f61bff55ddd6a97dd6e3b47ceab20eb78e6a
 SHA512:
-  metadata.gz: 304c31adfc470ac2852af55ecd84dab23be302df35917cdd683aeadd94c30fa86dae2b040e9b637365684f120677a5fcbbf6f8f6daa00d90f41f5ebd743f08e9
-  data.tar.gz: 68d730d2b58312cdc63acd4fb46e5d208436dfa6e9d2ec16086ec2c381efb5d8fc0cd6d1af7bf740e840084a26fb99489f43463d04456eef68a9c7ceb224585a
+  metadata.gz: a8e2cbd16ca12f5fcd1403a899ca97328f5887b670789939e3ca83dc9046dff670c75def5e294ad0a19433a528355147f9974cfaac077f838491286f6786af47
+  data.tar.gz: cc77979db17af2578c841b16d95bf7f7b4203e437fb490016509498c43348486399b046c8b0140795848d6cd44f67e3fa17bd1f6bd16a854bbc3569959bf3522

data/.gitignore

@@ -2,7 +2,6 @@
 *.tgz
 *~
 *.log
-/log/
 patches*
 *#
 TAGS
@@ -31,4 +30,4 @@ Gemfile.lock
 .idea
 .settings
 activerecord-jdbc.iml
-lib/arjdbc/jdbc/adapter_java.jar
+lib/arjdbc/jdbc/adapter_java.jar

data/.travis.yml

@@ -3,8 +3,6 @@ dist: xenial
 
 services:
   - mysql
-addons:
-  postgresql: 9.4
 
 before_install:
   - unset _JAVA_OPTIONS
@@ -17,7 +15,7 @@ install:
 
 language: ruby
 rvm:
-  - jruby-9.1.16.0
+  - jruby-9.2.7.0
 jdk:
   - openjdk8
 
@@ -49,45 +47,58 @@ before_script:
     || true
 
 env:
-  - DB=mysql2 PREPARED_STATEMENTS=false
-  - DB=mysql2 PREPARED_STATEMENTS=true
-  - DB=mysql2 DRIVER=MariaDB
-  - DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=false
-  - DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=true
-  - DB=postgresql PREPARED_STATEMENTS=true
-  - DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
-  - DB=sqlite3 PREPARED_STATEMENTS=false
-  - DB=sqlite3 PREPARED_STATEMENTS=true
-  - DB=jndi PREPARED_STATEMENTS=false
-  - DB=jndi PREPARED_STATEMENTS=true
+  global:
+    - AR_VERSION="6-0-stable"
 matrix:
   allow_failures:
     - rvm: jruby-head
   include:
-    # jruby-9.2
-    - rvm: jruby-9.2.6.0
-      env: DB=mysql2
-    - rvm: jruby-9.2.6.0
-      env: DB=postgresql
-    - rvm: jruby-9.2.6.0
-      env: DB=sqlite3
-    # jruby-9.2 + Java 11
-    - rvm: jruby-9.2.6.0
-      env: DB=mysql2
-      jdk: openjdk11
-    - rvm: jruby-9.2.6.0
-      env: DB=postgresql
-      jdk: openjdk11
-    - rvm: jruby-9.2.6.0
-      env: DB=sqlite3
-      jdk: openjdk11
+    - env: DB=mysql2 PREPARED_STATEMENTS=false
+    - env: DB=mysql2 PREPARED_STATEMENTS=true
+    - env: DB=mysql2 DRIVER=MariaDB
+
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=false
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=true
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql PREPARED_STATEMENTS=true
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
+    - addons:
+        postgresql: "9.4"
+      env: DB=postgresql PREPARED_STATEMENTS=true
+
+    - env: DB=sqlite3 PREPARED_STATEMENTS=false
+    - env: DB=sqlite3 PREPARED_STATEMENTS=true
+
+    - env: DB=jndi PREPARED_STATEMENTS=false
+    - env: DB=jndi PREPARED_STATEMENTS=true
+
+    # Java 11
+    - env: DB=mysql2
+      jdk: oraclejdk11
+    - env: DB=postgresql
+      jdk: oraclejdk11
+      addons:
+        postgresql: "10"
+    - env: DB=sqlite3
+      jdk: oraclejdk11
+
     # jruby-head
     - rvm: jruby-head
       env: DB=mysql2
     - rvm: jruby-head
       env: DB=postgresql
+      addons:
+        postgresql: "10"
     - rvm: jruby-head
       env: DB=sqlite3
+
     # testing against MariaDB
     - addons:
         mariadb: 10.2
@@ -95,10 +106,20 @@ matrix:
     - addons:
         mariadb: 10.3
       env: DB=mariadb PREPARED_STATEMENTS=true
+
     # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" DRIVER=MariaDB
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS on by default
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=false
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.2.3"
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" DRIVER=MariaDB
+
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS on by default
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" PREPARED_STATEMENTS=false
+    - addons:
+        postgresql: "9.4"
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS on by default
+
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-0-stable"

data/Gemfile

@@ -10,10 +10,15 @@ if ENV['RAILS']  # Use local clone of Rails
 
   activemodel_dir =  ::File.join(rails_dir, 'activemodel')
   activesupport_dir =  ::File.join(rails_dir, 'activesupport')
-  
+  actionpack_dir =  ::File.join(rails_dir, 'actionpack')
+  actionview_dir =  ::File.join(rails_dir, 'actionview')
+
   gem 'activerecord', require: false, path: activerecord_dir
   gem 'activemodel', require: false, path: activemodel_dir
   gem 'activesupport', require: false, path: activesupport_dir
+  gem 'actionpack', require: false, path: actionpack_dir
+  gem 'actionview', require: false, path: actionview_dir
+
 elsif ENV['AR_VERSION'] # Use specific version of AR and not .gemspec version
   version = ENV['AR_VERSION']
   
@@ -28,11 +33,13 @@ elsif ENV['AR_VERSION'] # Use specific version of AR and not .gemspec version
       else                                                              # branch
         opts = {branch: version}
       end
-    
+
       git 'https://github.com/rails/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

data/README.md

@@ -18,15 +18,15 @@ is not something we can do with the resources we currently have.
 
 Versions are targeted at certain versions of Rails and live on their own branches.
 
-| Gem Version | Rails Version | Branch |
-| ----------- | ------------- | ------ |
-| 50.x        | 5.0.x         | 50-stable |
-| 51.x        | 5.1.x         | 51-stable |
-| 52.x        | 5.2.x         | 52-stable |
-| future      | latest        | master    |
+| Gem Version | Rails Version | Branch    | min JRuby | min Java |
+| ----------- | ------------- | --------- | --------- | -------- |
+| 50.x        | 5.0.x         | 50-stable | 9.1.x     | 7        |
+| 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         | master    | 9.2.7     | 8        |
 
-The minimum version of JRuby for 50+ is JRuby **9.1.x** and
-JRuby 9.1+ requires Java 7 or newer (we recommend Java 8 at minimum).
+Note that JRuby 9.1.x is end-of-life. We recommend Java 8 at a minimum for all
+versions.
 
 ## Using ActiveRecord JDBC
 
@@ -83,6 +83,21 @@ production:
     connectTimeout: 60000
 ```
 
+#### MySQL specific notes
+
+Depending on the MySQL server configuration, it might be required to set
+additional connection properties for date/time support to work correctly. If you
+encounter problems, try adding this to your database configuration:
+
+```yml
+  properties:
+    serverTimezone: <%= java.util.TimeZone.getDefault.getID %>
+```
+
+The correct timezone depends on the system setup, but the one shown is a good
+place to start and is actually the correct setting for many systems.
+
+
 ### Standalone with ActiveRecord
 
 Once the setup is made (see below) you can establish a JDBC connection like this
@@ -157,7 +172,8 @@ ask on the #JRuby IRC channel on http://freenode.net/ (try [web-chat][6]).
 This project was originally written by [Nick Sieger](http://github.com/nicksieger)
 and [Ola Bini](http://github.com/olabini) with lots of help from the JRuby community.
 Polished 3.x compatibility and 4.x support (for AR-JDBC >= 1.3.0) was managed by
-[Karol Bucek](http://github.com/kares) among others.
+[Karol Bucek](http://github.com/kares) among others. Support for Rails 6 was
+contributed by [shellyBits GmbH](https://shellybits.ch/)
 
 ## License
 

data/Rakefile

@@ -185,7 +185,7 @@ if defined? JRUBY_VERSION
   #directory classes = 'pkg/classes'; CLEAN << classes
 
   file jar_file => FileList[ 'src/java/**/*.java' ] do
-    source = target = '1.7'; debug = true
+    source = target = '1.8'; debug = true
 
     get_driver_jars_local = lambda do |*args|
       driver_deps = args.empty? ? [ :Postgres, :MySQL ] : args

data/Rakefile.jdbc

@@ -17,4 +17,11 @@ desc "Build and install #{name}-#{version} gem into system gems"
 task('install') { gem_helper.install_gem }
 
 desc "Create tag #{version_tag} build and push #{name}-#{version} gem to Rubygems"
-task('release') { gem_helper.release_gem }
+task('release') do
+  gem_helper.instance_eval do
+    guard_clean
+    built_gem_path = build_gem
+    tag_version unless already_tagged?
+    rubygem_push(built_gem_path) if gem_push?
+  end
+end

data/activerecord-jdbc-adapter.gemspec

@@ -11,13 +11,10 @@ Gem::Specification.new do |gem|
   gem.license = 'BSD-2-Clause'
   gem.summary = 'JDBC adapter for ActiveRecord, for use within JRuby on Rails.'
   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, PostgreSQL and SQLite3 " <<
-    "as well as adapters for popular databases such as Oracle, SQLServer, " <<
-    "DB2, FireBird and even Java (embed) databases: Derby, HSQLDB and H2. " <<
-    "It allows to connect to virtually any JDBC-compliant database with your " <<
-    "JRuby on Rails application."
+    "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."
 
   gem.require_paths = ["lib"]
 
@@ -44,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', '~> 5.2.0'
+  gem.add_dependency 'activerecord', '~> 6.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/connection_management.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArJdbc
   module Abstract
     module ConnectionManagement
@@ -8,6 +10,11 @@ module ArJdbc
         @connection.active?
       end
 
+      def really_valid?
+        return unless @connection
+        @connection.really_valid?
+      end
+
       # @override
       def reconnect!
         super # clear_cache! && reset_transaction

data/lib/arjdbc/abstract/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArJdbc
   module Abstract
 
@@ -34,28 +36,26 @@ module ArJdbc
 
       protected
 
-      def translate_exception_class(e, sql)
-        begin
-          message = "#{e.class.name}: #{e.message}: #{sql}"
-        rescue Encoding::CompatibilityError
-          message = "#{e.class.name}: #{e.message.force_encoding sql.encoding}: #{sql}"
-        end
+      def translate_exception_class(e, sql, binds)
+        message = "#{e.class.name}: #{e.message}"
 
-        exception = translate_exception(e, message)
-        exception.set_backtrace e.backtrace unless e.equal?(exception)
+        exception = translate_exception(
+          e, message: message, sql: sql, binds: binds
+        )
+        exception.set_backtrace e.backtrace
         exception
       end
 
-      def translate_exception(e, message)
+      def translate_exception(exception, message:, sql:, binds:)
         # override in derived class
 
         # we shall not translate native "Java" exceptions as they might
         # swallow an ArJdbc / driver bug into an AR::StatementInvalid !
-        return e if e.is_a?(Java::JavaLang::Throwable)
+        return exception if exception.is_a?(Java::JavaLang::Throwable)
 
-        case e
-          when SystemExit, SignalException, NoMemoryError then e
-          when ActiveModel::RangeError, TypeError, RuntimeError then e
+        case exception
+          when SystemExit, SignalException, NoMemoryError then exception
+          when ActiveModel::RangeError, TypeError, RuntimeError then exception
           else super
         end
       end
@@ -74,13 +74,6 @@ module ArJdbc
     end
   end
 
-  module LogSubscriber
-    JDBC_GEM_ROOT = File.expand_path("../../../..", __FILE__) + "/"
-
-    # Remove this gem from log trace so that query shows where it was called in application
-    def ignored_callstack(path)
-      super || path.start_with?(JDBC_GEM_ROOT)
-    end
-  end
-  ActiveRecord::LogSubscriber.prepend(ArJdbc::LogSubscriber)
-end
+  JDBC_GEM_ROOT = File.expand_path("../../../..", __FILE__) + "/"
+  ActiveRecord::LogSubscriber.backtrace_cleaner.add_silencer { |line| line.start_with?(JDBC_GEM_ROOT) }
+end

data/lib/arjdbc/abstract/database_statements.rb

@@ -10,13 +10,19 @@ module ArJdbc
       NO_BINDS = [].freeze
 
       def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil)
+        if preventing_writes?
+          raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
+        end
+
+        materialize_transactions
+
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
         if without_prepared_statement?(binds)
-          log(sql, name) { @connection.execute_insert_pk(sql, pk) }
+          log(sql, name) { @connection.execute_insert(sql) }
         else
           log(sql, name, binds) do
-            @connection.execute_insert_pk(sql, binds, pk)
+            @connection.execute_insert(sql, binds)
           end
         end
       end
@@ -24,6 +30,12 @@ module ArJdbc
       # It appears that at this point (AR 5.0) "prepare" should only ever be true
       # if prepared statements are enabled
       def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false)
+        if preventing_writes? && write_query?(sql)
+          raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
+        end
+
+        materialize_transactions
+
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
         if without_prepared_statement?(binds)
@@ -38,6 +50,12 @@ module ArJdbc
       end
 
       def exec_update(sql, name = nil, binds = NO_BINDS)
+        if preventing_writes?
+          raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
+        end
+
+        materialize_transactions
+
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
         if without_prepared_statement?(binds)
@@ -49,6 +67,12 @@ module ArJdbc
       alias :exec_delete :exec_update
 
       def execute(sql, name = nil)
+        if preventing_writes? && write_query?(sql)
+          raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
+        end
+
+        materialize_transactions
+
         log(sql, name) { @connection.execute(sql) }
       end
 

data/lib/arjdbc/abstract/statement_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/statement_pool'
 
 module ArJdbc
@@ -41,11 +43,6 @@ module ArJdbc
         @statements[sql_key(sql)] ||= @connection.prepare_statement(sql)
       end
 
-      def supports_statement_cache?
-        ActiveSupport::Deprecation.deprecation_warning(__method__)
-        @jdbc_statement_cache_enabled
-      end
-
       private
 
       # This should be overridden by the adapter if the sql itself