activerecord-jdbc-alt-adapter 52.4.0-java → 61.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c26b1aeb852d6a51090bf9084b5371336673343434f2ac71e8ce11bacbf1c12
-  data.tar.gz: 770683c6f0474d1393224eb342768abf987614a6fdb8affc2095cb60dc6ce8fd
+  metadata.gz: dd61f85687802bf7bad5e3013413ccbda73395044d46775e8fa5f6d57e8410ca
+  data.tar.gz: 245c8e59a5bbf3e87e7f9f0759070dda617801ce650bdb089cb1c16daa4119eb
 SHA512:
-  metadata.gz: d76c562fb3f75d56af58bec90913e2f60dee2866e18b1c1f8589c6918fcddec36dac70763560af9bb334c021d198a81511e3a3501142b658fe98bd306ad42525
-  data.tar.gz: 2a4a6fa05469f1246cbc278b10d65a4fd9003e9e963a7bbb8abc302751c6bfabe37a12404f6da0a87c6c9804cd11e868eb11c94f93e58d0843da01e79c77ec6c
+  metadata.gz: f11b067072016b63fa265435c90d45672463cc80e5ac1e8199bc96d209704affdc30a75d89a6ac5fb67ea5fad06c91c7ef59af87651e387beb360e64dc027e32
+  data.tar.gz: b1e71248871946ccaa981bb0a74f08fdeba605637b020f704ae0197dad96c00947cfe0f87752f010499d6ddad9a6a97ffe7791cb6f7a0dd69e4f57f2d7643014

data/.gitignore

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

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.14.0
 jdk:
   - openjdk8
 
@@ -39,8 +37,8 @@ before_script:
     mysql -e "grant all privileges on activerecord_unittest.* to rails@localhost;" && \
     mysql -e "grant all privileges on activerecord_unittest2.* to rails@localhost;" && \
     mysql -e "grant all privileges on inexistent_activerecord_unittest.* to rails@localhost;" && \
-    mysql -e "CREATE DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;" && \
-    mysql -e "CREATE DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;" \
+    mysql -e "CREATE DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8mb4;" && \
+    mysql -e "CREATE DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8mb4;" \
     || true
   - |
     [ "$DB" == "postgresql" ] && [ "$TEST_PREFIX" == "rails:" ] && \
@@ -49,45 +47,61 @@ 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="master"
 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: "10"
+      env: DB=postgresql PREPARED_STATEMENTS=true JRUBY_OPTS=-J-Duser.timezone=America/Detroit
+    - 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 +109,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-1-stable" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-1-stable" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-1-stable" DRIVER=MariaDB
+
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS on by default
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" PREPARED_STATEMENTS=false
+    - addons:
+        postgresql: "9.4"
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS on by default
+
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-1-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
@@ -48,13 +55,13 @@ group :test do
   gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
 
   gem 'bcrypt', '~> 3.1.11', require: false
-  gem 'jdbc-mssql', '~> 0.7.0', require: nil
+  gem 'jdbc-mssql', '~> 0.9.0', require: nil
   # gem 'pry-debugger-jruby', platform: :jruby
 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
 

data/README.md

@@ -2,20 +2,25 @@
 
 This adapter is a fork of the ActiveRecord JDBC Adapter with basic support for
 **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)
+supported by the original adapter such as MySQL but it is advised to
+use the [original adapter](https://github.com/jruby/activerecord-jdbc-adapter)
 
 This adapter only works with JRuby and it is advised to install the latest
-stable versions of Rails
+stable of this adapter and 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
-- For Rails `5.2.3` install the `52.2.0` version of this adapter
-
-Support for Rails 6.0 is planned in the future.
+| Gem Version | Rails Version | min JRuby |
+| ----------- | ------------- | --------- |
+| 50.7.0      | 5.0.7         | 9.1.x     |
+| 51.7.0      | 5.1.7         | 9.1.x     |
+| 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    |
 
 This adapter passes most of the Rails tests (ActiveRecord tests) with the
-exception of some test that are not compatible with the SQL Server
+exception of some test that are not compatible with the SQL Server. To run
+the test use the following fork [Rails](https://github.com/JesseChavez/rails/tree/6-1-stable-dev),
+and the instructions in file `RUNNING_TESTS.md`. The fork has some
+schema tweaks to make it compatible with SQL Server.
 
 ### How to use it:
 
@@ -24,13 +29,19 @@ Add the following to your `Gemfile`:
 ```ruby
 platforms :jruby do
   # Use jdbc as the database for Active Record
-  gem 'activerecord-jdbc-alt-adapter', '~> 50.3.1', require: 'arjdbc'
-  gem 'jdbc-mssql', '~> 0.6.0'
+  gem 'activerecord-jdbc-alt-adapter', '~> 61.0.0'
+  gem 'jdbc-mssql', '~> 0.9.0'
 end
 ```
 
-Or look at the sample rails 5.0 app  [wombat](https://github.com/JesseChavez/wombat50)
-and see how is set up.
+Or look at the sample rails and see how is set up:
+
+- Rails 6.1 sample app [wombat61](https://github.com/JesseChavez/wombat61)
+
+- Rails 6.0 sample app [wombat60](https://github.com/JesseChavez/wombat60)
+
+- Rails 5.0 sample app [wombat50](https://github.com/JesseChavez/wombat50)
+
 
 ### Breaking changes
 
@@ -102,14 +113,6 @@ production:
 ```
 
 
-### NOTE
-
-Keep one eye in the Rails connection pool, we have not thoroughly tested that
-part since we don't use the default Rails connection pool, other than that
-this adapter should just work.
-
-
-
 # ActiveRecord JDBC Adapter
 
 [![Gem Version](https://badge.fury.io/rb/activerecord-jdbc-adapter.svg)][7]
@@ -130,15 +133,16 @@ 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         | 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
 
@@ -195,6 +199,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
@@ -213,8 +232,8 @@ Proceed as with Rails; specify `ActiveRecord` in your Bundle along with the
 chosen JDBC adapter(s), this time sample *Gemfile* for MySQL:
 
 ```ruby
-gem 'activerecord', '~> 5.0.6'
-gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+gem 'activerecord', '~> 6.0.3'
+gem 'activerecord-jdbcmysql-adapter', '~> 60.2', :platform => :jruby
 ```
 
 When you `require 'bundler/setup'` everything will be set up for you as expected.
@@ -223,13 +242,13 @@ When you `require 'bundler/setup'` everything will be set up for you as expected
 
 Install the needed gems with JRuby, for example:
 
-    gem install activerecord -v "~> 5.0.6"
-    gem install activerecord-jdbc-adapter --ignore-dependencies
+    gem install activerecord -v "~> 6.0.3"
+    gem install activerecord-jdbc-adapter -v "~> 60.2" --ignore-dependencies
 
 If you wish to use the adapter for a specific database, you can install it
 directly and the (jdbc-) driver gem (dependency) will be installed as well:
 
-    jruby -S gem install activerecord-jdbcmysql-adapter
+    jruby -S gem install activerecord-jdbcmysql-adapter -v "~> 60.2"
 
 Your program should include:
 
@@ -269,7 +288,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.0 and 6.1 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"]
 
@@ -37,14 +34,14 @@ Gem::Specification.new do |gem|
     #gem.requirements << "jar org.postgresql:postgresql, 42.1.4.jre6, :scope => :compile"
 
     # compilation .jar dependencies for extension (at least until `mvn') :
-    gem.add_development_dependency 'jdbc-mysql', '~> 5.1.44'
+    gem.add_development_dependency 'jdbc-mysql', '~> 8.0.0'
     gem.add_development_dependency 'jdbc-postgres', '~> 42.1'
   end
 
   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.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

@@ -5,21 +5,18 @@ Gem::Specification.new do |gem|
   path = File.expand_path('lib/arjdbc/version.rb', File.dirname(__FILE__))
   gem.version = File.read(path).match( /.*VERSION\s*=\s*['"](.*)['"]/m )[1]
   gem.platform = 'java' # due jar-dependencies to resolve requirements for ext
-  gem.authors = ['Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors']
-  gem.email = ['nick@nicksieger.com', 'ola.bini@gmail.com', 'self@kares.org']
+  gem.authors = ['Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors']
+  gem.email = ['nick@nicksieger.com', 'ola.bini@gmail.com', 'self@kares.org', 'jesse.chavez.r@gmail.com']
   gem.homepage = 'https://github.com/JesseChavez/activerecord-jdbc-adapter'
   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, " <<
     "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 " <<
-    "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"]
 
@@ -39,19 +36,19 @@ Gem::Specification.new do |gem|
     #gem.requirements << "jar org.postgresql:postgresql, 42.1.4.jre6, :scope => :compile"
 
     # compilation .jar dependencies for extension (at least until `mvn') :
-    gem.add_development_dependency 'jdbc-mysql', '~> 5.1.44'
+    gem.add_development_dependency 'jdbc-mysql', '~> 8.0.0'
     gem.add_development_dependency 'jdbc-postgres', '~> 42.1'
   end
 
   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', '>= 5.2.3'
+  gem.add_dependency 'activerecord', '~> 6.1.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", "-HN", "-f", "darkfish"]
 end