Merge pull request #1081 from dr-itz/rails61-dev

Rails 6.1 fixes

Author: enebo

.travis.yml

@@ -15,7 +15,7 @@ install:
 
 language: ruby
 rvm:
-  - jruby-9.2.13.0
+  - jruby-9.2.14.0
 jdk:
   - openjdk8
 
@@ -111,18 +111,18 @@ matrix:
       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-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="master" # PS on by default
+      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="master" PREPARED_STATEMENTS=false
+      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="master" # PS on by default
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS on by default
 
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="master"
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-1-stable"

activerecord-jdbc-adapter.gemspec

@@ -41,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.1.a'
+  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'