activerecord-jdbc-alt-adapter 52.6.0-java → 60.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bbef112a6aaadd08c19169b2e2b1826e99a44f38f2d2b2e3b441383ab95b91b
-  data.tar.gz: 444be17b783f8b937d57cdbd47260b79f4d69a75117523b4848ec9171d082c85
+  metadata.gz: 4018232c43fd8cfccb8349f8c9a1be1ebd8addf9aaa8f96f3830df20ceb33c96
+  data.tar.gz: 0a4971a64e52dbd5e3623777593d596511d96da7217ef8bcc83472a7638fd9d5
 SHA512:
-  metadata.gz: bc41292328eb23e4d84a13fcc5213c1a44780ee974c207b930ca17357304f7feef2497a3642c231ef350d91d371e631a108e72d74da8d5c734d5f3194257c76c
-  data.tar.gz: d2a6656b88aa2432a54b9de7b27066847136de6857b6848901d3f3551dd65f5aa92787dfc9f83c7e44195509faf86416eb59ef9a04627499dc4883388882df04
+  metadata.gz: 28bae6826777ff61c6643bb96fab4aba5489c6d6650d6d1cfa1f3773f5cf7f85464b96e58ec113d61a02b513e928dcf71d82c63b569b710c247bd15ef371bb41
+  data.tar.gz: 733b05c9b0ccb42aa53480f8a4ee4bd6432849defb4483f3583364120420bf1c90df011a5b7abf73bb83c55cc3b85e71bb863da7cbc025852862ccc85841daf0

data/.gitignore

@@ -34,5 +34,3 @@ 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.7.0
 jdk:
   - openjdk8
 
@@ -49,45 +47,58 @@ 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="6-0-stable"
 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: "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 +106,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-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: "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="6-0-stable" # PS on by default
+
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-0-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

data/README.md

@@ -8,9 +8,9 @@ use the [original adapter](https://github.com/jruby/active)
 This adapter only works with JRuby and it is advised to install the latest
 stable versions of Rails
 
-- For Rails `5.0.7` install the `50.7.0` version of this adapter
-- For Rails `5.1.7` install the `51.7.0` version of this adapter
-- For Rails `5.2.4` install the `52.6.0` version of this adapter
+- 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.
 
@@ -24,8 +24,8 @@ Add the following to your `Gemfile`:
 ```ruby
 platforms :jruby do
   # Use jdbc as the database for Active Record
-  gem 'activerecord-jdbc-alt-adapter', '~> 52.6.0'
-  gem 'jdbc-mssql', '~> 0.9.0'
+  gem 'activerecord-jdbc-alt-adapter', '~> 50.3.1', require: 'arjdbc'
+  gem 'jdbc-mssql', '~> 0.6.0'
 end
 ```
 
@@ -130,15 +130,15 @@ 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         | 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 +195,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
@@ -269,7 +284,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
 

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"]
 
@@ -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', '~> 5.2.0'
+  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/activerecord-jdbc-alt-adapter.gemspec

@@ -13,13 +13,10 @@ Gem::Specification.new do |gem|
   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"]
 
@@ -46,7 +43,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.2.0', '>= 5.2.3'
+  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/arel/visitors/sqlserver.rb

@@ -4,13 +4,8 @@
 module Arel
   module Visitors
     class SQLServer < Arel::Visitors::ToSql
-
-      OFFSET = " OFFSET "
-      ROWS = " ROWS"
-      FETCH = " FETCH NEXT "
-      FETCH0 = " FETCH FIRST (SELECT 0) "
-      ROWS_ONLY = " ROWS ONLY"
-
+      # 'FETCH FIRST' or 'FETCH NEXT' do the same thing
+      # The SQL ANSI Standard says NEXT and FIRST are synonyms
 
       private
 
@@ -35,24 +30,24 @@ module Arel
 
       def visit_Arel_Nodes_Lock o, collector
         o.expr = Arel.sql('WITH(UPDLOCK)') if o.expr.to_s =~ /FOR UPDATE/
-        collector << SPACE
+        collector << ' '
         visit o.expr, collector
       end
 
       def visit_Arel_Nodes_Offset o, collector
-        collector << OFFSET
+        collector << ' OFFSET '
         visit o.expr, collector
-        collector << ROWS
+        collector << ' ROWS'
       end
 
       def visit_Arel_Nodes_Limit o, collector
         if node_value(o) == 0
-          collector << FETCH0
-          collector << ROWS_ONLY
+          collector << ' FETCH FIRST (SELECT 0) '
+          collector << ' ROWS ONLY'
         else
-          collector << FETCH
+          collector << ' FETCH NEXT '
           visit o.expr, collector
-          collector << ROWS_ONLY
+          collector << ' ROWS ONLY'
         end
       end
 
@@ -61,7 +56,7 @@ module Arel
         distinct_One_As_One_Is_So_Not_Fetch o
         if o.with
           collector = visit o.with, collector
-          collector << SPACE
+          collector << ' '
         end
         collector = o.cores.inject(collector) { |c,x|
           visit_Arel_Nodes_SelectCore(x, c)
@@ -99,7 +94,7 @@ module Arel
           collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector
         end
         if o.right.any?
-          collector << SPACE if o.left
+          collector << ' ' if o.left
           collector = inject_join o.right, collector, ' '
         end
         collector
@@ -110,7 +105,7 @@ module Arel
         collector = visit o.left, collector
         collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
         if o.right
-          collector << SPACE
+          collector << ' '
           visit(o.right, collector)
         else
           collector
@@ -121,16 +116,31 @@ module Arel
         collector << "LEFT OUTER JOIN "
         collector = visit o.left, collector
         collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
-        collector << SPACE
+        collector << ' '
         visit o.right, collector
       end
 
+      # NOTE: this overrides the original method in arel visitors 'to_sql.rb'
+      # fixes The ORDER BY clause is invalid in subqueries
+      # FIXME: we should probably have a 2-pass visitor for this
+      def build_subselect(key, o)
+        stmt             = Nodes::SelectStatement.new
+        core             = stmt.cores.first
+        core.froms       = o.relation
+        core.wheres      = o.wheres
+        core.projections = [key]
+        stmt.limit       = o.limit
+        stmt.offset      = o.offset
+        stmt.orders      = []
+        stmt
+      end
+
       # SQLServer ToSql/Visitor (Additions)
 
       def visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, options = {}
         if select_statement_lock?
           collector = visit @select_statement.lock, collector
-          collector << SPACE if options[:space]
+          collector << ' ' if options[:space]
         end
         collector
       end
@@ -138,12 +148,12 @@ module Arel
       def visit_Orders_And_Let_Fetch_Happen o, collector
         make_Fetch_Possible_And_Deterministic o
         unless o.orders.empty?
-          collector << SPACE
-          collector << ORDER_BY
+          collector << ' '
+          collector << ' ORDER BY '
           len = o.orders.length - 1
           o.orders.each_with_index { |x, i|
             collector = visit(x, collector)
-            collector << COMMA unless len == i
+            collector << ', ' unless len == i
           }
         end
         collector
@@ -205,7 +215,7 @@ module Arel
         elsif Arel::Nodes::SqlLiteral === core.from
           Arel::Table.new(core.from)
         elsif Arel::Nodes::JoinSource === core.source
-          Arel::Nodes::SqlLiteral === core.source.left ? Arel::Table.new(core.source.left, @engine) : core.source.left
+          Arel::Nodes::SqlLiteral === core.source.left ? Arel::Table.new(core.source.left, @engine) : core.source.left.left
         end
       end