Merge branch 'master' into jdbc-mysql-8

Author: kares

.gitignore

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

.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.2.7.0
+  - jruby-9.2.9.0
 jdk:
   - openjdk8
 
@@ -50,7 +48,7 @@ before_script:
 
 env:
   global:
-    - AR_VERSION="6-0-stable"
+    - AR_VERSION="master"
 matrix:
   allow_failures:
     - rvm: jruby-head
@@ -60,17 +58,20 @@ matrix:
     - env: DB=mysql2 DRIVER=MariaDB
 
     - addons:
-        postgresql: "9.4"
+        postgresql: "10"
       env: DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=false
     - addons:
-        postgresql: "9.4"
+        postgresql: "10"
       env: DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=true
     - addons:
-        postgresql: "9.4"
+        postgresql: "10"
       env: DB=postgresql PREPARED_STATEMENTS=true
     - addons:
-        postgresql: "9.4"
+        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
@@ -84,7 +85,7 @@ matrix:
     - env: DB=postgresql
       jdk: oraclejdk11
       addons:
-        postgresql: "9.4"
+        postgresql: "10"
     - env: DB=sqlite3
       jdk: oraclejdk11
 
@@ -94,7 +95,7 @@ matrix:
     - rvm: jruby-head
       env: DB=postgresql
       addons:
-        postgresql: "9.4"
+        postgresql: "10"
     - rvm: jruby-head
       env: DB=sqlite3
 
@@ -107,15 +108,18 @@ matrix:
       env: DB=mariadb PREPARED_STATEMENTS=true
 
     # Rails test-suite :
-    - 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
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="master" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="master" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="master" DRIVER=MariaDB
 
     - addons:
-        postgresql: "9.4"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS on by default
+        postgresql: "10"
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="master" # PS on by default
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="master" PREPARED_STATEMENTS=false
     - addons:
         postgresql: "9.4"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" PREPARED_STATEMENTS=false
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="master" # PS on by default
 
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-0-stable"
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="master"

Gemfile

@@ -59,7 +59,7 @@ end
 
 group :rails do
   group :test do
-    gem 'minitest', '~> 5.11.3', require: nil
+    gem 'minitest', '~> 5.12.2', require: nil
     gem 'minitest-excludes', '~> 2.0.1', require: nil
     gem 'minitest-rg', require: nil
 

README.md

@@ -5,27 +5,29 @@
 ActiveRecord-JDBC-Adapter (AR-JDBC) is the main database adapter for Rails'
 *ActiveRecord* component that can be used with [JRuby][0].
 ActiveRecord-JDBC-Adapter provides full or nearly full support for:
-**MySQL**, **PostgreSQL**, **SQLite3**.  In the near future there are plans to
-add support **MSSQL**. Unless we get more contributions we will not be going
-beyond these four adapters.  Note that the amount of work needed to get
-another adapter is not huge but the amount of testing required to make sure
-that adapter continues to work is not something we can do with the resources
-we currently have.
+**MySQL**, **PostgreSQL**, **SQLite3** and **MSSQL*** (SQLServer).
 
-For Oracle database users you are encouraged to use
-https://github.com/rsim/oracle-enhanced.
+Unless we get more contributions we will not be supporting more adapters.
+Note that the amount of work needed to get another adapter is not huge but
+the amount of testing required to make sure that adapter continues to work
+is not something we can do with the resources we currently have.
+
+- for **Oracle** database users you are encouraged to use
+  https://github.com/rsim/oracle-enhanced
+- **MSSQL** adapter's gem parts reside in a [separate repository][8]
 
 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         | 60-stable | 9.2.7     | 8        |
+| 61.x        | 6.1.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
 
@@ -39,6 +41,7 @@ adapters are available:
   - MySQL (`activerecord-jdbcmysql-adapter`)
   - PostgreSQL (`activerecord-jdbcpostgresql-adapter`)
   - SQLite3 (`activerecord-jdbcsqlite3-adapter`)
+  - MSSQL (`activerecord-jdbcsqlserver-adapter`)
 
 2. If you're generating a new Rails application, use the following command:
 
@@ -81,6 +84,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
@@ -155,7 +173,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
 
@@ -173,4 +192,4 @@ license the database's drivers are licensed. See each driver gem's LICENSE.txt.
 [5]: https://github.com/jruby/activerecord-jdbc-adapter/wiki
 [6]: https://webchat.freenode.net/?channels=#jruby
 [7]: http://badge.fury.io/rb/activerecord-jdbc-adapter
-[8]: https://github.com/jruby/activerecord-jdbc-adapter/wiki/Migrating-from-1.2.x-to-1.3.0
+[8]: https://github.com/jruby/activerecord-jdbcsqlserver-adapter

Rakefile

@@ -1,3 +1,29 @@
+# Common usage
+#
+#   rake build:adapters - to build all specific adapter gems and the base gem
+#   rake release:do - build:adapters + git tag + push gems
+#
+# Environment variables used by this Rakefile:
+#
+# 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
+#   in any task which generates our main gem.  The wrinkle to this
+#   is when we do a custom github link in bundler:
+#
+#      gem 'ar-jdbc', github: '...'
+#
+#   Because we stopped committing a .jar file for every change and so when
+#   we  include a gem like this it clones the repository and does a default
+#   build in rake.  This in turn will end up forcing a compile to generate
+#   that jar (similar to how c-extensions compile at the time of install).
+#   For shipped gems we do include the jar so that people do not require
+#   this compile step.
+#
+# NOOP [release:do - false]
+#
+#   No commands or gem pushing during a release.
+
 require 'rake/clean'
 
 CLEAN.include 'derby*', 'test.db.*', '*test.sqlite3', 'test/reports'
@@ -38,7 +64,8 @@ rake = lambda { |task| ruby "-S", "rake", task }
 
 desc "Build #{gem_name} gem into the pkg directory."
 task :build => :jar do
-  sh("RELEASE=#{ENV['RELEASE']} gem build -V '#{gemspec_path}'") do
+  include_jar = ENV['INCLUDE_JAR_IN_GEM'] || 'true'
+  sh("INCLUDE_JAR_IN_GEM=#{include_jar} gem build -V '#{gemspec_path}'") do
     gem_path = built_gem_path.call
     file_name = File.basename(gem_path)
     FileUtils.mkdir_p(File.join(base_dir, 'pkg'))
@@ -58,7 +85,6 @@ end
 
 desc "Releasing AR-JDBC gems (use NOOP=true to disable gem pushing)"
 task 'release:do' do
-  ENV['RELEASE'] = 'true' # so that .gemspec is built with adapter_java.jar
   Rake::Task['build'].invoke
   Rake::Task['build:adapters'].invoke
 
@@ -257,7 +283,7 @@ if defined? JRUBY_VERSION
       begin
         require 'arjdbc/version'
       rescue LoadError
-        path = File.expand_path('../lib', File.dirname(__FILE__))
+        path = File.expand_path('lib', File.dirname(__FILE__))
         unless $LOAD_PATH.include?(path)
           $LOAD_PATH << path; retry
         end
@@ -297,7 +323,7 @@ if defined? JRUBY_VERSION
       # class_files.gsub!('$', '\$') unless windows?
       # args = class_files.map { |path| [ "-C #{classes_dir}", path ] }.flatten
 
-      if ENV['RELEASE'] == 'true'; require 'tempfile'
+      if ENV['INCLUDE_JAR_IN_GEM'] == 'true'; require 'tempfile'
         manifest  = "Built-Time: #{Time.now.utc.strftime('%Y-%m-%d %H:%M:%S')}\n"
         manifest += "Built-JRuby: #{JRUBY_VERSION}\n"
         manifest += "Specification-Title: ActiveRecord-JDBC\n"

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"]
 
@@ -27,7 +24,7 @@ Gem::Specification.new do |gem|
     reject { |f| f =~ /^(gemfiles)/ } # no tests - no Gemfile_s appraised ...
   gem.files += ['lib/arjdbc/jdbc/adapter_java.jar'] #if ENV['RELEASE'].eql?('true')
 
-  if ENV['RELEASE'] != 'true' # @see Rakefile
+  if ENV['INCLUDE_JAR_IN_GEM'] != 'true' # @see Rakefile
     gem.extensions << 'Rakefile' # to support auto-building .jar with :git paths
 
     #gem.add_runtime_dependency 'jar-dependencies', '~> 0.1' # development not enough!
@@ -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', '~> 6.0.0.rc1'
+  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'

bench/setup.rb

@@ -2,7 +2,22 @@
 
 require 'rubygems' unless defined? Gem
 
-gem 'activerecord', ENV['AR_VERSION'] if ENV['AR_VERSION']
+if ENV['RAILS']  # Use local clone of Rails
+  rails_dir = ENV['RAILS']
+
+  activerecord_dir = ::File.join(rails_dir, 'activerecord', 'lib')
+  if !::File.exist?(rails_dir) && !::File.exist?(activerecord_dir)
+    raise "ENV['RAILS'] set but does not point at a valid rails clone"
+  end
+  puts "--- Using AR from #{activerecord_dir}"
+
+  $LOAD_PATH << ::File.join(rails_dir, 'activesupport', 'lib')
+  $LOAD_PATH << ::File.join(rails_dir, 'activemodel', 'lib')
+  $LOAD_PATH << activerecord_dir
+elsif ENV['AR_VERSION']
+  gem 'activerecord', ENV['AR_VERSION']
+end
+
 require 'active_record'
 require 'active_record/version'
 
@@ -12,7 +27,7 @@
                       require 'arjdbc'
                       ArJdbc::VERSION
                     else
-                      $LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
+                      $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
                       require 'arjdbc'
                       "#{ArJdbc::VERSION} #{`git rev-parse HEAD`[0, 8]}"
                     end

lib/active_record/connection_adapters/mssql_adapter.rb

@@ -56,7 +56,7 @@ def translate_exception(exception, message:, sql:, binds:)
         case exception
           when SystemExit, SignalException, NoMemoryError then exception
           when ActiveModel::RangeError, TypeError, RuntimeError then exception
-          else ActiveRecord::StatementInvalid.new(message, sql: sql, binds: binds)
+          else super
         end
       end