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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83a5e387ec9999cc730027498dec97428cfee7b3c3edcc6845a779c01c4272a
-  data.tar.gz: 3a7e9ce2b8e6e968bdb21f4ac72a9f498e3226c414ec4b003e4b463dffc74062
+  metadata.gz: dd61f85687802bf7bad5e3013413ccbda73395044d46775e8fa5f6d57e8410ca
+  data.tar.gz: 245c8e59a5bbf3e87e7f9f0759070dda617801ce650bdb089cb1c16daa4119eb
 SHA512:
-  metadata.gz: f71a50d80a6f01837512d87a52ef32ec69a245e1927086cc0736efa35835c57710652f1ad6c294039422ad69eea20d308b48df02ba8d43e7c1acea4de7358ee0
-  data.tar.gz: 732cde407f1c4ff98bb7e528ea183dd483e2b8edf8a475f60f445dc7580fd8e8d3374ca248b5d7eb2f02b1c596efdeed5ce7dc393563425565657ca6302d6145
+  metadata.gz: f11b067072016b63fa265435c90d45672463cc80e5ac1e8199bc96d209704affdc30a75d89a6ac5fb67ea5fad06c91c7ef59af87651e387beb360e64dc027e32
+  data.tar.gz: b1e71248871946ccaa981bb0a74f08fdeba605637b020f704ae0197dad96c00947cfe0f87752f010499d6ddad9a6a97ffe7791cb6f7a0dd69e4f57f2d7643014

data/.travis.yml

@@ -15,7 +15,7 @@ install:
 
 language: ruby
 rvm:
-  - jruby-9.2.7.0
+  - jruby-9.2.14.0
 jdk:
   - openjdk8
 
@@ -37,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:" ] && \
@@ -48,7 +48,7 @@ before_script:
 
 env:
   global:
-    - AR_VERSION="6-0-stable"
+    - AR_VERSION="master"
 matrix:
   allow_failures:
     - rvm: jruby-head
@@ -111,18 +111,18 @@ matrix:
       env: DB=mariadb PREPARED_STATEMENTS=true
 
     # Rails test-suite :
-    - 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
+    - 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-0-stable" # 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="6-0-stable" 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="6-0-stable" # 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="6-0-stable"
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-1-stable"

data/Gemfile

@@ -61,7 +61,7 @@ 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,22 +2,23 @@
 
 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 of this adapter and Rails
 
 | Gem Version | Rails Version | min JRuby |
 | ----------- | ------------- | --------- |
-| 50.6.1      | 5.0.7.2       | 9.1.x     |
-| 51.6.1      | 5.1.7         | 9.1.x     |
-| 52.5.1      | 5.2.4.1       | 9.1.x     |
-| 60.0.0      | 6.0.2         | 9.2.9     |
+| 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. To run
-the test use the following fork [Rails](https://github.com/JesseChavez/rails/tree/6-0-stable-dev),
+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.
 
@@ -28,16 +29,18 @@ Add the following to your `Gemfile`:
 ```ruby
 platforms :jruby do
   # Use jdbc as the database for Active Record
-  gem 'activerecord-jdbc-alt-adapter', '~> 60.0.0'
-  gem 'jdbc-mssql', '~> 0.7.0'
+  gem 'activerecord-jdbc-alt-adapter', '~> 61.0.0'
+  gem 'jdbc-mssql', '~> 0.9.0'
 end
 ```
 
 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)
 
-- Old rails 5.0 app  [wombat50](https://github.com/JesseChavez/wombat50)
+- Rails 5.0 sample app [wombat50](https://github.com/JesseChavez/wombat50)
 
 
 ### Breaking changes
@@ -135,7 +138,8 @@ Versions are targeted at certain versions of Rails and live on their own branche
 | 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        |
+| 60.x        | 6.0.x         | 60-stable | 9.2.7     | 8        |
+| 61.x        | 6.1.x         | master    | 9.2.7     | 8        |
 
 Note that JRuby 9.1.x is end-of-life. We recommend Java 8 at a minimum for all
 versions.
@@ -228,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.
@@ -238,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:
 
@@ -284,7 +288,7 @@ 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. Support for Rails 6 was
+[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/activerecord-jdbc-adapter.gemspec

@@ -34,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', '~> 6.0.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,8 +5,8 @@ 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'
@@ -36,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', '~> 6.0.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'
   #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
 

data/lib/arel/visitors/postgresql_jdbc.rb

@@ -2,5 +2,5 @@ require 'arel/visitors/compat'
 
 class Arel::Visitors::PostgreSQL
   # AREL converts bind argument markers "?" to "$n" for PG, but JDBC wants "?".
-  remove_method :visit_Arel_Nodes_BindParam if ArJdbc::AR42
+  remove_method :bind_block
 end

data/lib/arel/visitors/sqlserver.rb

@@ -51,6 +51,11 @@ module Arel
         end
       end
 
+      def visit_Arel_Nodes_Grouping(o, collector)
+        remove_invalid_ordering_from_select_statement(o.expr)
+        super
+      end
+
       def visit_Arel_Nodes_SelectStatement o, collector
         @select_statement = o
         distinct_One_As_One_Is_So_Not_Fetch o
@@ -183,9 +188,11 @@ module Arel
 
       def make_Fetch_Possible_And_Deterministic o
         return if o.limit.nil? && o.offset.nil?
+
         t = table_From_Statement o
         pk = primary_Key_From_Table t
         return unless pk
+
         if o.orders.empty?
           # Prefer deterministic vs a simple `(SELECT NULL)` expr.
           o.orders = [pk.asc]
@@ -221,6 +228,7 @@ 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)
         # NOTE: for table name aliases columns_hash('table_alias')  requires to return an empty hash.
         column_name = @connection.schema_cache.primary_keys(t.name) ||
@@ -234,6 +242,14 @@ module Arel
         ).quoted
       end
 
+      # Need to remove ordering from subqueries unless TOP/OFFSET also used. Otherwise, SQLServer
+      # returns error "The ORDER BY clause is invalid in views, inline functions, derived tables,
+      # subqueries, and common table expressions, unless TOP, OFFSET or FOR XML is also specified."
+      def remove_invalid_ordering_from_select_statement(node)
+        return unless Arel::Nodes::SelectStatement === node
+
+        node.orders = [] unless node.offset || node.limit
+      end
     end
   end
 end

data/lib/arjdbc/abstract/core.rb

@@ -56,6 +56,7 @@ module ArJdbc
         case exception
           when SystemExit, SignalException, NoMemoryError then exception
           when ActiveModel::RangeError, TypeError, RuntimeError then exception
+          when ActiveRecord::ConnectionNotEstablished then exception
           else super
         end
       end

data/lib/arjdbc/abstract/database_statements.rb

@@ -15,6 +15,7 @@ module ArJdbc
         end
 
         materialize_transactions
+        mark_transaction_written_if_write(sql)
 
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
@@ -35,6 +36,7 @@ module ArJdbc
         end
 
         materialize_transactions
+        mark_transaction_written_if_write(sql)
 
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
@@ -55,6 +57,7 @@ module ArJdbc
         end
 
         materialize_transactions
+        mark_transaction_written_if_write(sql)
 
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
@@ -72,6 +75,7 @@ module ArJdbc
         end
 
         materialize_transactions
+        mark_transaction_written_if_write(sql)
 
         log(sql, name) { @connection.execute(sql) }
       end

data/lib/arjdbc/abstract/transaction_support.rb

@@ -24,26 +24,26 @@ module ArJdbc
       # Starts a database transaction.
       # @override
       def begin_db_transaction
-        log('BEGIN TRANSACTION', nil) { @connection.begin }
+        log('BEGIN', 'TRANSACTION') { @connection.begin }
       end
 
       # Starts a database transaction.
       # @param isolation the transaction isolation to use
       def begin_isolated_db_transaction(isolation)
-        log("BEGIN ISOLATED TRANSACTION - #{isolation}", nil) { @connection.begin(isolation) }
+        log("BEGIN ISOLATED - #{isolation}", 'TRANSACTION') { @connection.begin(isolation) }
       end
 
       # Commits the current database transaction.
       # @override
       def commit_db_transaction
-        log('COMMIT TRANSACTION', nil) { @connection.commit }
+        log('COMMIT', 'TRANSACTION') { @connection.commit }
       end
 
       # Rolls back the current database transaction.
       # Called from 'rollback_db_transaction' in the AbstractAdapter
       # @override
       def exec_rollback_db_transaction
-        log('ROLLBACK TRANSACTION', nil) { @connection.rollback }
+        log('ROLLBACK', 'TRANSACTION') { @connection.rollback }
       end
 
       ########################## Savepoint Interface ############################
@@ -55,7 +55,7 @@ module ArJdbc
       # @since 1.3.0
       # @extension added optional name parameter
       def create_savepoint(name = current_savepoint_name)
-        log("SAVEPOINT #{name}", 'Savepoint') { @connection.create_savepoint(name) }
+        log("SAVEPOINT #{name}", 'TRANSACTION') { @connection.create_savepoint(name) }
       end
 
       # Transaction rollback to a given (previously created) save-point.
@@ -64,7 +64,7 @@ module ArJdbc
       # @param name the save-point name
       # @extension added optional name parameter
       def exec_rollback_to_savepoint(name = current_savepoint_name)
-        log("ROLLBACK TO SAVEPOINT #{name}", 'Savepoint') { @connection.rollback_savepoint(name) }
+        log("ROLLBACK TO SAVEPOINT #{name}", 'TRANSACTION') { @connection.rollback_savepoint(name) }
       end
 
       # Release a previously created save-point.
@@ -73,9 +73,22 @@ module ArJdbc
       # @param name the save-point name
       # @extension added optional name parameter
       def release_savepoint(name = current_savepoint_name)
-        log("RELEASE SAVEPOINT #{name}", 'Savepoint') { @connection.release_savepoint(name) }
+        log("RELEASE SAVEPOINT #{name}", 'TRANSACTION') { @connection.release_savepoint(name) }
       end
 
     end
   end
 end
+
+# patch to avoid the usage of WeakMap
+require 'active_record/connection_adapters/abstract/transaction'
+module ActiveRecord
+  module ConnectionAdapters
+    class Transaction
+      def add_record(record, ensure_finalize = true)
+        @records ||= []
+        @records << record
+      end
+    end
+  end
+end

data/lib/arjdbc/mssql.rb

@@ -6,4 +6,4 @@ module ArJdbc
   MsSQL = MSSQL # compatibility with 1.2
 end
 
-ArJdbc.warn_unsupported_adapter 'mssql', [6, 0] # warns on AR >= 4.2
+ArJdbc.warn_unsupported_adapter 'mssql', [6, 1] # warns on AR >= 4.2

data/lib/arjdbc/mssql/adapter.rb

@@ -224,7 +224,7 @@ module ActiveRecord
 
       # FIXME: This needs to be fixed when we implement the collation per
       # column basis. At the moment we only use the global database collation
-      def default_uniqueness_comparison(attribute, value, klass) # :nodoc:
+      def default_uniqueness_comparison(attribute, value) # :nodoc:
         column = column_for_attribute(attribute)
 
         if [:string, :text].include?(column.type) && collation && !collation.match(/_CS/) && !value.nil?
@@ -313,6 +313,8 @@ module ActiveRecord
 
       def translate_exception(exception, message:, sql:, binds:)
         case message
+        when /no connection available/i
+          ConnectionNotEstablished.new(exception)
         when /(cannot insert duplicate key .* with unique index) | (violation of unique key constraint)/i
           RecordNotUnique.new(message, sql: sql, binds: binds)
         when /Lock request time out period exceeded/i

data/lib/arjdbc/mssql/column.rb

@@ -5,8 +5,10 @@ module ActiveRecord
     # MSSQL specific extensions to column definitions in a table.
     class MSSQLColumn < Column
       attr_reader :table_name
+
       def initialize(name, raw_default, sql_type_metadata = nil, null = true, table_name = nil, default_function = nil, collation = nil, comment: nil)
         @table_name = table_name
+
         default = extract_default(raw_default)
 
         super(name, default, sql_type_metadata, null, default_function, collation: collation, comment: comment)
@@ -28,6 +30,18 @@ module ActiveRecord
         sql_type.downcase.include? 'identity'
       end
 
+      def ==(other)
+        other.is_a?(MSSQLColumn) &&
+          super &&
+          table_name == other.table_name
+      end
+      alias :eql? :==
+
+      def hash
+        MSSQLColumn.hash ^
+          super.hash ^
+          table_name.hash
+      end
     end
   end
 end