activerecord-jdbc-alt-adapter 50.7.0-java → 51.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fccd81ff713725fd656c08d96bbbd658a7443a7260fa722e6d08bc601c093a94
-  data.tar.gz: 9729f0e2efe3eed4b5b2b191a773fc0dc1ce0ab74c057755df8b4b77a3ad9a22
+  metadata.gz: a685f3d4b7d4a927785b4c4e6d0617967552c297e87a65cf1f66ea7e0fdd5c83
+  data.tar.gz: ca34ee0b1f3bb347e54815af6272f6eb4e183daa9f35dc739e8d60bc3630cfd2
 SHA512:
-  metadata.gz: 2542dd2750603e0e4fa7a0e550cacda950548ed65d8a95ef6e8c2e060fe4a771a2940dbefb78eefed46d572dcd8f467b96a041a5e62ee6df1dc3490db96f977c
-  data.tar.gz: c3d55ae33d32a70f1f666c1385956278417bf0332bd455c34326af36647a9163ed72a0317a4707398d43c7c48d9287ce911828e61bb588bd58ef47693df410dc
+  metadata.gz: 2a83701ef6268570ede2d819b1f2296eede75f30d9a75c7ae21ce87cd6eea95584bd096019d7e80149476f7107e7310dbd0c701f8eadc0c28fbd87cde2155568
+  data.tar.gz: 4764519a0791450964dd35136ec81584934bfc08ab81fd1d1cd8bbe912aa602d55ed3525cec59c45dd863c64e94a6da506c9cd10932b755a76e8d31d05ee3188

data/.gitignore

@@ -2,7 +2,6 @@
 *.tgz
 *~
 *.log
-/log/
 patches*
 *#
 TAGS
@@ -34,5 +33,3 @@ activerecord-jdbc.iml
 lib/arjdbc/jdbc/adapter_java.jar
 .jrubyrc
 tags
-.ruby-version
-pik.sh

data/.travis.yml

@@ -1,27 +1,18 @@
+language: ruby
 sudo: false
-dist: xenial
-
-services:
-  - mysql
-addons:
-  postgresql: 9.4
-
+branches:
+  only:
+  - master
+  - /.*-stable$/
+  - /^test-.*/
+  - /maintenance|support/
+  - /.*dev$/
+bundler_args: --without development
+script: bundle exec rake ${TEST_PREFIX}test_$DB
 before_install:
   - unset _JAVA_OPTIONS
   - rvm @default,@global do gem uninstall bundler -a -x -I || true
   - gem install bundler -v "~>1.17.3"
-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.1.16.0
-jdk:
-  - openjdk8
-
-script: bundle exec rake ${TEST_PREFIX}test_$DB
 before_script:
   - echo "JAVA_OPTS=$JAVA_OPTS"
   - export JRUBY_OPTS="-J-Xms64M -J-Xmx1024M"
@@ -47,7 +38,12 @@ before_script:
     psql  -c "create database activerecord_unittest;" -U postgres && \
     psql  -c "create database activerecord_unittest2;" -U postgres \
     || true
-
+rvm:
+  - jruby-9.1.16.0
+jdk:
+  - openjdk8
+addons:
+  postgresql: "9.4"
 env:
   - DB=mysql2 PREPARED_STATEMENTS=false
   - DB=mysql2 PREPARED_STATEMENTS=true
@@ -90,15 +86,15 @@ matrix:
       env: DB=sqlite3
     # testing against MariaDB
     - addons:
-        mariadb: 10.2
+        mariadb: '10.0'
       env: DB=mariadb PREPARED_STATEMENTS=false
     - addons:
-        mariadb: 10.3
+        mariadb: '10.1'
       env: DB=mariadb PREPARED_STATEMENTS=true
     # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" DRIVER=MariaDB
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" # PS on by default
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" PREPARED_STATEMENTS=false
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1"
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.7" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.7" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.7" DRIVER=MariaDB
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.1.7" # PS on by default
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.1.7" PREPARED_STATEMENTS=false
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.1.7"

data/Gemfile

@@ -48,8 +48,8 @@ group :test do
   gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
 
   gem 'bcrypt', '~> 3.1.11', require: false
-  gem 'builder', require: false
-  gem 'jdbc-mssql', '~> 0.7.0', require: nil
+  gem 'jdbc-mssql', '~> 0.6.0', require: nil
+  # gem 'pry-debugger-jruby', platform: :jruby
 end
 
 group :rails do
@@ -62,6 +62,9 @@ group :rails do
     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"
   # NOTE: due rails/activerecord/test/cases/connection_management_test.rb
   gem 'rack', require: nil

data/README.md

@@ -1,10 +1,17 @@
 # ActiveRecord JDBC Alternative Adapter
 
 This adapter is a fork of the ActiveRecord JDBC Adapter with basic support for
-**SQL Server/Azure SQL** only, At this stage only works with JRuby on Rails 5.0
-and support for Rails 5.1 is planned in the near future. This adapter may work
-with other databases supported by the original adapter but it is advised to
-use the [original adapter](https://github.com/jruby/activerecord-jdbc-adapter)
+**SQL Server/Azure SQL**. This adapter may work with other databases
+supported by the original adapter such as PostgreSQL but it is advised to
+use the [original adapter](https://github.com/jruby/active)
+
+This adapter only works with JRuby and it is advised to install the latest
+stable versins of Rails
+
+- For Rails `5.0.7.2` install the `50.3.1` version of this adapter
+- For Rails `5.1.7` install the `51.3.0` version of this adapter
+
+Support for Rails 5.2 is planned in the near future.
 
 
 ### How to use it:
@@ -29,16 +36,17 @@ and see how is set up.
   support that SQL dialect.
 - This adapter uses the `datetime2` sql data type as the Rails logical `datetime` data type.
 - This adapter needs the mssql jdbc driver version 7.0.0  onwards to work properly,
-  therefore you can use the gem `jdbc-mssql` version `0.5.0` onwards or the actual
+  therefore you can use the gem `jdbc-mssql` version `0.6.0` onwards or the actual
   driver jar file  version `7.0.0`.
 
 
 ### Recommendation
 
-If you have the old sql server `datetime` data type for created_at and
-updated_at, you don't need to be upgraded straightaway to `datetime2`, the old data type
-(`datetime_basic`) will still work fine, just make you add to the time zone
-aware list.
+If you have the old sql server `datetime` data type for `created_at` and
+`updated_at`, you don't need to upgrade straightaway to `datetime2`, the old data type
+(`datetime_basic`) will still work for simple updates, just make you add to the time zone
+aware list. If you have complex `datetime` queries it is advised to upgrade to
+`datetime2`
 
 ```ruby
 # time zone aware configuration.
@@ -106,16 +114,15 @@ this adapter should just work.
 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** and **MSSQL*** (SQLServer).
-
-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.
+**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.
 
-- 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]
+For Oracle database users you are encouraged to use
+https://github.com/rsim/oracle-enhanced.
 
 Version **50.x** supports Rails version 5.0.x and it lives on branch 50-stable.
 Version **51.x** supports Rails version 5.1.x and is currently on master until
@@ -134,7 +141,6 @@ 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:
 
@@ -269,4 +275,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-jdbcsqlserver-adapter
+[8]: https://github.com/jruby/activerecord-jdbc-adapter/wiki/Migrating-from-1.2.x-to-1.3.0

data/Rakefile

@@ -1,29 +1,3 @@
-# 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'
@@ -64,8 +38,7 @@ rake = lambda { |task| ruby "-S", "rake", task }
 
 desc "Build #{gem_name} gem into the pkg directory."
 task :build => :jar do
-  include_jar = ENV['INCLUDE_JAR_IN_GEM'] || 'true'
-  sh("INCLUDE_JAR_IN_GEM=#{include_jar} gem build -V '#{gemspec_path}'") do
+  sh("RELEASE=#{ENV['RELEASE']} 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'))
@@ -85,6 +58,7 @@ 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
 
@@ -283,7 +257,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
@@ -323,7 +297,7 @@ if defined? JRUBY_VERSION
       # class_files.gsub!('$', '\$') unless windows?
       # args = class_files.map { |path| [ "-C #{classes_dir}", path ] }.flatten
 
-      if ENV['INCLUDE_JAR_IN_GEM'] == 'true'; require 'tempfile'
+      if ENV['RELEASE'] == '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"

data/activerecord-jdbc-adapter.gemspec

@@ -27,7 +27,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['INCLUDE_JAR_IN_GEM'] != 'true' # @see Rakefile
+  if ENV['RELEASE'] != '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 +44,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.0.0', '>= 5.0.3'
+  gem.add_dependency 'activerecord', '~> 5.1.0'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/activerecord-jdbc-alt-adapter.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |gem|
   gem.license = 'BSD-2-Clause'
   gem.summary = 'ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server'
   gem.description = "" <<
-    "Fork of the ActiveRecord JDBC adapter with support for SQL Server and Azure SQL,"
+    "Fork of the ActiveRecord JDBC adapter with support for SQL Server/Azure SQL, " <<
+    "for more information and help look at the README file in the github repository. " <<
     "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 " <<
@@ -28,7 +29,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['INCLUDE_JAR_IN_GEM'] != 'true' # @see Rakefile
+  if ENV['RELEASE'] != '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!
@@ -45,7 +46,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.0.0', '>= 5.0.3'
+  gem.add_dependency 'activerecord', '~> 5.1.0', '>= 5.1.7'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arel/visitors/sqlserver.rb

@@ -99,17 +99,29 @@ module Arel
           collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector
         end
         if o.right.any?
-          collector << " " if o.left
+          collector << SPACE if o.left
           collector = inject_join o.right, collector, ' '
         end
         collector
       end
 
+      def visit_Arel_Nodes_InnerJoin o, collector
+        collector << "INNER JOIN "
+        collector = visit o.left, collector
+        collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
+        if o.right
+          collector << SPACE
+          visit(o.right, collector)
+        else
+          collector
+        end
+      end
+
       def visit_Arel_Nodes_OuterJoin o, collector
         collector << "LEFT OUTER JOIN "
         collector = visit o.left, collector
         collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
-        collector << " "
+        collector << SPACE
         visit o.right, collector
       end
 
@@ -199,7 +211,9 @@ module Arel
 
       def primary_Key_From_Table t
         return unless t
-        column_name = schema_cache.primary_keys(t.name) || column_cache(t.name).first.try(:second).try(:name)
+        # column_name = schema_cache.primary_keys(t.name) || column_cache(t.name).first.try(:second).try(:name)
+        column_name = @connection.schema_cache.primary_keys(t.name) ||
+          @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
         column_name ? t[column_name] : nil
       end
 

data/lib/arjdbc/abstract/core.rb

@@ -22,7 +22,7 @@ module ArJdbc
 
         connection.configure_connection # will call us (maybe)
       end
-
+      
       # Retrieve the raw `java.sql.Connection` object.
       # The unwrap parameter is useful if an attempt to unwrap a pooled (JNDI)
       # connection should be made - to really return the 'native' JDBC object.
@@ -47,6 +47,8 @@ module ArJdbc
       end
 
       def translate_exception(e, message)
+        # 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)
@@ -54,7 +56,7 @@ module ArJdbc
         case e
           when SystemExit, SignalException, NoMemoryError then e
           when ActiveModel::RangeError, TypeError, RuntimeError then e
-          else super
+          else ActiveRecord::StatementInvalid.new(message)
         end
       end
 

data/lib/arjdbc/abstract/database_statements.rb

@@ -10,13 +10,11 @@ module ArJdbc
       NO_BINDS = [].freeze
 
       def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil)
-        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,8 +22,6 @@ 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)
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
-
         if without_prepared_statement?(binds)
           log(sql, name) { @connection.execute_query(sql) }
         else
@@ -38,8 +34,6 @@ module ArJdbc
       end
 
       def exec_update(sql, name = nil, binds = NO_BINDS)
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
-
         if without_prepared_statement?(binds)
           log(sql, name) { @connection.execute_update(sql) }
         else

data/lib/arjdbc/abstract/transaction_support.rb

@@ -13,15 +13,8 @@ module ArJdbc
         @connection.supports_savepoints?
       end
 
-      # Does this adapter support setting the isolation level for a transaction?
-      # Unlike 'plain' `ActiveRecord` we allow checking for concrete transaction
-      # isolation level support by the database.
-      # @param level optional to check if we support a specific isolation level
-      # @since 1.3.0
-      # @extension added optional level parameter
-      def supports_transaction_isolation?(level = nil)
-        return false unless level
-        @connection.supports_transaction_isolation?(level)
+      def supports_transaction_isolation?
+        @connection.supports_transaction_isolation?
       end
 
       ########################## Transaction Interface ##########################

data/lib/arjdbc/db2/adapter.rb

@@ -342,60 +342,10 @@ module ArJdbc
 
     # Properly quotes the various data types.
     # @param value contains the data
-    # @param column (optional) contains info on the field
     # @override
-    def quote(value, column = nil)
-      return value.quoted_id if value.respond_to?(:quoted_id)
+    def quote(value)
       return value if sql_literal?(value)
-
-      if column
-        if column.respond_to?(:primary) && column.primary && column.klass != String
-          return value.to_i.to_s
-        end
-        if value && (column.type.to_sym == :decimal || column.type.to_sym == :integer)
-          return value.to_s
-        end
-      end
-
-      column_type = column && column.type.to_sym
-
-      case value
-      when nil then 'NULL'
-      when Numeric # IBM_DB doesn't accept quotes on numeric types
-        # if the column type is text or string, return the quote value
-        if column_type == :text || column_type == :string
-          "'#{value}'"
-        else
-          value.to_s
-        end
-      when String, ActiveSupport::Multibyte::Chars
-        if column_type == :binary && column.sql_type !~ /for bit data/i
-          if update_lob_value?(value, column)
-            value.nil? ? 'NULL' : BLOB_VALUE_MARKER # '@@@IBMBINARY@@@'"
-          else
-            "BLOB('#{quote_string(value)}')"
-          end
-        elsif column && column.sql_type =~ /clob/ # :text
-          if update_lob_value?(value, column)
-            value.nil? ? 'NULL' : CLOB_VALUE_MARKER # "'@@@IBMTEXT@@@'"
-          else
-            "'#{quote_string(value)}'"
-          end
-        elsif column_type == :xml
-          value.nil? ? 'NULL' : "'#{quote_string(value)}'" # "'<ibm>@@@IBMXML@@@</ibm>'"
-        else
-          "'#{quote_string(value)}'"
-        end
-      when Symbol then "'#{quote_string(value.to_s)}'"
-      when Time
-        # AS400 doesn't support date in time column
-        if column_type == :time
-          quote_time(value)
-        else
-          super
-        end
-      else super
-      end
+      super
     end
 
     # @override

data/lib/arjdbc/jdbc/column.rb

@@ -26,17 +26,23 @@ module ActiveRecord
           end
         end
 
-        default = args[0].cast(default)
+        if ArJdbc::AR50
+          default = args[0].cast(default)
 
-        sql_type = args.delete_at(1)
-        type = args.delete_at(0)
+          sql_type = args.delete_at(1)
+          type = args.delete_at(0)
 
-        args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
+          args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
+        elsif ArJdbc::AR42
+          default = args[0].type_cast_from_database(default)
+        else
+          default = default_value(default)
+        end
 
         # super <= 4.1: (name, default, sql_type = nil, null = true)
         # super >= 4.2: (name, default, cast_type, sql_type = nil, null = true)
         # super >= 5.0: (name, default, sql_type_metadata = nil, null = true)
-
+        
         super(name, default, *args)
         init_column(name, default, *args)
       end

data/lib/arjdbc/jdbc/error.rb

@@ -3,7 +3,7 @@ module ActiveRecord
   class JDBCError < WrappedDatabaseException
 
     def initialize(message = nil, cause = $!)
-      super( ( message.nil? && cause ) ? cause.message : message, nil )
+      super( ( message.nil? && cause ) ? cause.message : message )
       if cause.is_a? Java::JavaSql::SQLException
         @jdbc_exception, @cause = cause, nil
       else

data/lib/arjdbc/jdbc.rb

@@ -2,8 +2,12 @@ require 'active_support/deprecation'
 
 module ArJdbc
 
+  # @private
+  AR40 = ::ActiveRecord::VERSION::MAJOR > 3
   # @private
   AR42 = ::ActiveRecord::VERSION::STRING >= '4.2'
+  # @private
+  AR50 = ::ActiveRecord::VERSION::MAJOR > 4
 
   class << self