activerecord-jdbc-adapter 60.0.rc1-java → 60.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e64a303bc353b9633ce0f10e3fd20bb8688b37151a1730562fbeaddb0f35d9
-  data.tar.gz: f25ac879568e2c07c7699716ed6d82900d6cd1c2ef86814f8702f49b87dfff2c
+  metadata.gz: e2483f430b747553967113a2fd1640d9b18fefe0691f469d5354866e22f90366
+  data.tar.gz: f777663ca67b683292712b44ce2999f1067d5c0ee964665b513e5aee48e38602
 SHA512:
-  metadata.gz: 07ba52dda6e804feacee1f5e00efe87c078b8e2a104f1d772b4dfa192994db7322a2f1b7e3a6ea08360b39d7d27b01d8f359880147ae197164e0beaeff15bbe0
-  data.tar.gz: 76cd40a5cf5d65e545319f4603e310c6422e342d16419b95bf0b60ab7591a2edb7153fe5c78e499b0cbf1b5650f30493dba388ba85143df38c9cae40d8aa5ec8
+  metadata.gz: c1775e6f11af7145b7224b4f0f9a56b18f545a74202e31cb41a6fae6325c10df97f106caaf6937d659e89acf33d3288744f60a961e4f488e8cf559e87c804a2e
+  data.tar.gz: 4cc0292d069ff57c01ce7d9a844bcfe64d32d07aeb47ba664a74fbdfc851af2bbbd34c30ab2219950b49e75edf215e0a3aefb98bd995c5b89648db7532ed1a89

data/.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

data/.travis.yml

@@ -1,16 +1,25 @@
-language: ruby
 sudo: false
-branches:
-  only:
-  - master
-  - /.*-stable$/
-  - /^test-.*/
-  - /maintenance|support/
-  - /.*dev$/
-bundler_args: --without development
-script: bundle exec rake ${TEST_PREFIX}test_$DB
+dist: xenial
+
+services:
+  - mysql
+
 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.2.7.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"
@@ -36,13 +45,10 @@ before_script:
     psql  -c "create database activerecord_unittest;" -U postgres && \
     psql  -c "create database activerecord_unittest2;" -U postgres \
     || true
-rvm:
-  - jruby-9.2.7.0
-jdk:
-  - openjdk8
+
 env:
   global:
-    - AR_VERSION="master"
+    - AR_VERSION="6-0-stable"
 matrix:
   allow_failures:
     - rvm: jruby-head
@@ -52,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
@@ -76,7 +85,7 @@ matrix:
     - env: DB=postgresql
       jdk: oraclejdk11
       addons:
-        postgresql: "9.4"
+        postgresql: "10"
     - env: DB=sqlite3
       jdk: oraclejdk11
 
@@ -86,28 +95,31 @@ matrix:
     - rvm: jruby-head
       env: DB=postgresql
       addons:
-        postgresql: "9.4"
+        postgresql: "10"
     - rvm: jruby-head
       env: DB=sqlite3
 
     # testing against MariaDB
     - addons:
-        mariadb: '10.0'
+        mariadb: 10.2
       env: DB=mariadb PREPARED_STATEMENTS=false
     - addons:
-        mariadb: '10.1'
+        mariadb: 10.3
       env: DB=mariadb PREPARED_STATEMENTS=true
 
     # Rails test-suite :
-    - 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
+    - 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: "9.4"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="master" # PS on by default
+        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="master" PREPARED_STATEMENTS=false
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS on by default
 
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="master"
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-0-stable"

data/README.md

@@ -5,27 +5,28 @@
 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         | 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 +40,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 +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
@@ -155,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
 
@@ -173,4 +191,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

data/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"

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"]
 
@@ -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'

data/lib/arjdbc/abstract/connection_management.rb

@@ -10,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

@@ -56,7 +56,7 @@ module ArJdbc
         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
 

data/lib/arjdbc/abstract/database_statements.rb

@@ -16,11 +16,13 @@ module ArJdbc
 
         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(sql) }
+          log(sql, name) { @connection.execute_insert_pk(sql, pk) }
         else
           log(sql, name, binds) do
-            @connection.execute_insert(sql, binds)
+            @connection.execute_insert_pk(sql, binds, pk)
           end
         end
       end
@@ -34,6 +36,8 @@ module ArJdbc
 
         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_query(sql) }
         else
@@ -52,6 +56,8 @@ module ArJdbc
 
         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_update(sql) }
         else
@@ -60,25 +66,6 @@ module ArJdbc
       end
       alias :exec_delete :exec_update
 
-      # overridden to support legacy binds
-      def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
-        super
-      end
-      alias create insert
-
-      # overridden to support legacy binds
-      def update(arel, name = nil, binds = [])
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
-        super
-      end
-
-      # overridden to support legacy binds
-      def delete(arel, name = nil, binds = [])
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
-        super
-      end
-
       def execute(sql, name = nil)
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"

data/lib/arjdbc/db2/adapter.rb

@@ -328,6 +328,17 @@ module ArJdbc
       select_one(sql).nil?
     end
 
+    # @override
+    def primary_keys(table)
+      # If no schema in table name is given but present in URL parameter. Use the URL parameter one
+      # This avoids issues if the table is present in multiple schemas
+      if table.split(".").size == 1 && schema
+        table = "#{schema}.#{table}"
+      end
+
+      super
+    end
+
     def next_sequence_value(sequence_name)
       select_value("SELECT NEXT VALUE FOR #{sequence_name} FROM sysibm.sysdummy1")
     end