activerecord-jdbc-alt-adapter 61.1.0-java → 70.0.0-java

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 61.1.0
+  version: 70.0.0
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
   name: activerecord
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
 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
@@ -38,6 +38,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".nvimlog"
 - ".travis.yml"
@@ -52,13 +54,9 @@ files:
 - Rakefile.jdbc
 - activerecord-jdbc-adapter.gemspec
 - activerecord-jdbc-alt-adapter.gemspec
-- lib/active_record/connection_adapters/as400_adapter.rb
-- lib/active_record/connection_adapters/db2_adapter.rb
-- lib/active_record/connection_adapters/derby_adapter.rb
 - lib/active_record/connection_adapters/firebird_adapter.rb
 - lib/active_record/connection_adapters/h2_adapter.rb
 - lib/active_record/connection_adapters/hsqldb_adapter.rb
-- lib/active_record/connection_adapters/informix_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter.rb
 - lib/active_record/connection_adapters/jndi_adapter.rb
 - lib/active_record/connection_adapters/mariadb_adapter.rb
@@ -71,9 +69,6 @@ files:
 - lib/activerecord-jdbc-adapter.rb
 - lib/activerecord-jdbc-alt-adapter.rb
 - lib/arel/visitors/compat.rb
-- lib/arel/visitors/db2.rb
-- lib/arel/visitors/derby.rb
-- lib/arel/visitors/firebird.rb
 - lib/arel/visitors/h2.rb
 - lib/arel/visitors/hsqldb.rb
 - lib/arel/visitors/postgresql_jdbc.rb
@@ -86,20 +81,7 @@ files:
 - lib/arjdbc/abstract/database_statements.rb
 - lib/arjdbc/abstract/statement_cache.rb
 - lib/arjdbc/abstract/transaction_support.rb
-- lib/arjdbc/db2.rb
-- lib/arjdbc/db2/adapter.rb
-- lib/arjdbc/db2/as400.rb
-- lib/arjdbc/db2/column.rb
-- lib/arjdbc/db2/connection_methods.rb
-- lib/arjdbc/derby.rb
-- lib/arjdbc/derby/active_record_patch.rb
-- lib/arjdbc/derby/adapter.rb
-- lib/arjdbc/derby/connection_methods.rb
-- lib/arjdbc/derby/schema_creation.rb
 - lib/arjdbc/discover.rb
-- lib/arjdbc/firebird.rb
-- lib/arjdbc/firebird/adapter.rb
-- lib/arjdbc/firebird/connection_methods.rb
 - lib/arjdbc/h2.rb
 - lib/arjdbc/h2/adapter.rb
 - lib/arjdbc/h2/connection_methods.rb
@@ -109,8 +91,6 @@ files:
 - lib/arjdbc/hsqldb/explain_support.rb
 - lib/arjdbc/hsqldb/schema_creation.rb
 - lib/arjdbc/informix.rb
-- lib/arjdbc/informix/adapter.rb
-- lib/arjdbc/informix/connection_methods.rb
 - lib/arjdbc/jdbc.rb
 - lib/arjdbc/jdbc/adapter.rb
 - lib/arjdbc/jdbc/adapter_java.jar
@@ -173,13 +153,9 @@ files:
 - lib/arjdbc/sqlite3.rb
 - lib/arjdbc/sqlite3/adapter.rb
 - lib/arjdbc/sqlite3/connection_methods.rb
-- lib/arjdbc/sybase.rb
-- lib/arjdbc/sybase/adapter.rb
 - lib/arjdbc/tasks.rb
 - lib/arjdbc/tasks/database_tasks.rb
 - lib/arjdbc/tasks/databases.rake
-- lib/arjdbc/tasks/db2_database_tasks.rb
-- lib/arjdbc/tasks/derby_database_tasks.rb
 - lib/arjdbc/tasks/h2_database_tasks.rb
 - lib/arjdbc/tasks/hsqldb_database_tasks.rb
 - lib/arjdbc/tasks/jdbc_database_tasks.rb
@@ -206,13 +182,9 @@ files:
 - src/java/arjdbc/ArJdbcModule.java
 - src/java/arjdbc/db2/DB2Module.java
 - src/java/arjdbc/db2/DB2RubyJdbcConnection.java
-- src/java/arjdbc/derby/DerbyModule.java
-- src/java/arjdbc/derby/DerbyRubyJdbcConnection.java
-- src/java/arjdbc/firebird/FirebirdRubyJdbcConnection.java
 - src/java/arjdbc/h2/H2Module.java
 - src/java/arjdbc/h2/H2RubyJdbcConnection.java
 - src/java/arjdbc/hsqldb/HSQLDBModule.java
-- src/java/arjdbc/informix/InformixRubyJdbcConnection.java
 - src/java/arjdbc/jdbc/AdapterJavaService.java
 - src/java/arjdbc/jdbc/Callable.java
 - src/java/arjdbc/jdbc/ConnectionFactory.java
@@ -250,9 +222,6 @@ post_install_message:
 rdoc_options:
 - "--main"
 - README.md
-- "-HN"
-- "-f"
-- darkfish
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -266,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server

data/lib/active_record/connection_adapters/as400_adapter.rb

@@ -1,2 +0,0 @@
-require 'arjdbc/db2'
-require 'arjdbc/db2/as400'

data/lib/active_record/connection_adapters/db2_adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc/db2'

data/lib/active_record/connection_adapters/derby_adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc/derby'

data/lib/active_record/connection_adapters/informix_adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc/informix'

data/lib/arel/visitors/db2.rb

@@ -1,137 +0,0 @@
-# NOTE: file contains code adapted from **ruby-ibmdb**'s adapter, license follows
-=begin
-Copyright (c) 2006 - 2015 IBM Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=end
-
-require 'arel/visitors/compat'
-
-module Arel
-  module Visitors
-    class DB2 < Arel::Visitors::ToSql
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_SelectStatement(o, a = nil)
-          a = o.cores.inject(a) { |c, x| visit_Arel_Nodes_SelectCore(x, c) }
-
-          unless o.orders.empty?
-            a << ' ORDER BY '
-            last = o.orders.length - 1
-            o.orders.each_with_index do |x, i|
-              visit(x, a);  a << ', ' unless last == i
-            end
-          end
-
-          if limit = o.limit
-            if limit = limit.value
-              limit = limit.to_i
-            end
-          end
-          if offset = o.offset
-            if offset = offset.value
-              offset = offset.to_i
-            end
-          end
-
-          if limit || offset
-            add_limit_offset(a, o, limit, offset)
-          else
-            a
-          end
-        end
-
-        def visit_Arel_Nodes_Limit o, collector
-          # visit o.expr, collector
-        end
-
-        def visit_Arel_Nodes_Offset o, collector
-          # visit o.expr, collector
-        end
-
-      else
-        def visit_Arel_Nodes_SelectStatement o, a = nil
-          sql = o.cores.map { |x| do_visit_select_core x, a }.join
-          sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
-
-          if limit = o.limit
-            if limit = limit.value
-              limit = limit.to_i
-            end
-          end
-          if offset = o.offset
-            if offset = offset.value
-              offset = offset.to_i
-            end
-          end
-
-          if limit || offset
-            add_limit_offset(sql, o, limit, offset)
-          else
-            sql
-          end
-        end
-      end
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_InsertStatement o, a = nil
-          a << "INSERT INTO "
-          visit(o.relation, a)
-
-          values = o.values
-
-          if o.columns.any?
-            cols = o.columns.map { |x| quote_column_name x.name }
-            a << ' (' << cols.join(', ') << ') '
-          elsif o.values.eql? ArJdbc::DB2::VALUES_DEFAULT
-            cols = o.relation.engine.columns.map { |c| c.name }
-            a << ' (' << cols.join(', ') << ')'
-            a << ' VALUES '
-            a << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-            values = false
-          end
-          visit(values, a) if values
-          a
-        end
-      elsif Arel::VERSION >= '4.0' # AR 4.0 ... AREL 5.0 since AR >= 4.1
-        def visit_Arel_Nodes_InsertStatement o, a = nil
-          sql = "INSERT INTO "
-          sql << visit(o.relation, a)
-
-          values = o.values
-
-          if o.columns.any?
-            cols = o.columns.map { |x| quote_column_name x.name }
-            sql << ' (' << cols.join(', ') << ') '
-          # should depend the other way around but who cares it's AR
-          elsif o.values.eql? ArJdbc::DB2::VALUES_DEFAULT
-            cols = o.relation.engine.columns.map { |c| c.name }
-            sql << ' (' << cols.join(', ') << ')'
-            sql << ' VALUES '
-            sql << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-            values = nil
-          end
-
-          sql << visit(values, a) if values
-
-          sql
-        end
-      end
-
-      private
-
-      def add_limit_offset(sql, o, limit, offset)
-        @connection.replace_limit_offset! sql, limit, offset, o.orders
-      end
-
-    end
-  end
-end
-
-Arel::Collectors::Bind.class_eval do
-  attr_reader :parts
-end if defined? Arel::Collectors::Bind

data/lib/arel/visitors/derby.rb

@@ -1,112 +0,0 @@
-require 'arel/visitors/compat'
-
-module Arel
-  module Visitors
-    class Derby < Arel::Visitors::ToSql
-
-      # @private
-      STR_1 = ' '
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_SelectStatement(o, a = nil)
-          a = o.cores.inject(a) { |c, x| visit_Arel_Nodes_SelectCore(x, c) }
-          unless o.orders.empty?
-            a << ' ORDER BY '
-            last = o.orders.length - 1
-            o.orders.each_with_index do |x, i|
-              visit(x, a);  a << ', ' unless last == i
-            end
-          end
-          if o.offset
-            a << STR_1; visit(o.offset, a)
-          end
-          if o.limit
-            a << STR_1; visit(o.limit, a)
-          end
-          if o.lock
-            a << STR_1; visit(o.lock, a)
-          end
-          a
-        end
-      else
-        def visit_Arel_Nodes_SelectStatement(o, a = nil)
-          sql = o.cores.map { |x| do_visit(x, a) }.join
-          sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
-          sql << " #{do_visit o.offset, a}" if o.offset
-          sql << " #{do_visit o.limit, a}" if o.limit
-          sql << " #{do_visit o.lock, a}" if o.lock
-          sql
-        end
-      end
-
-      def visit_Arel_Nodes_Limit(o, a = nil)
-        limit = "FETCH FIRST #{limit_for(o)} ROWS ONLY"
-        a << limit if a
-        limit
-      end
-
-      def visit_Arel_Nodes_Offset(o, a = nil)
-        if a
-          a << 'OFFSET '
-          do_visit(o.value, a)
-          a << ' ROWS'
-        else
-          "OFFSET #{do_visit o.value, a} ROWS"
-        end
-      end
-
-      # This generates SELECT...FOR UPDATE, but it will only work if the
-      # current transaction isolation level is set to SERIALIZABLE.  Otherwise,
-      # locks aren't held for the entire transaction.
-      def visit_Arel_Nodes_Lock o, a = nil
-        do_visit o.expr, a
-      end
-
-      # @private
-      VALUES_DEFAULT = 'VALUES ( DEFAULT )' # NOTE: marker set by ArJdbc::Derby
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_InsertStatement o, a = nil
-          a << "INSERT INTO "
-          visit(o.relation, a)
-
-          values = o.values
-
-          if o.columns.any?
-            cols = o.columns.map { |x| quote_column_name x.name }
-            a << ' (' << cols.join(', ') << ') '
-          elsif o.values.eql? VALUES_DEFAULT
-            cols = o.relation.engine.columns.map { |c| c.name }
-            a << ' (' << cols.join(', ') << ')'
-            a << ' VALUES '
-            a << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-            values = false
-          end
-          visit(values, a) if values
-          a
-        end
-      elsif Arel::VERSION >= '4.0' # AR 4.0 ... AREL 5.0 since AR >= 4.1
-        def visit_Arel_Nodes_InsertStatement o, a = nil
-          sql = 'INSERT INTO '
-          sql << visit(o.relation, a)
-
-          values = o.values
-
-          if o.columns.any?
-            cols = o.columns.map { |x| quote_column_name x.name }
-            sql << ' (' << cols.join(', ') << ') '
-          elsif o.values.eql? VALUES_DEFAULT
-            cols = o.relation.engine.columns.map { |c| c.name }
-            sql << ' (' << cols.join(', ') << ')'
-            sql << ' VALUES '
-            sql << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-            values = false
-          end
-
-          sql << visit(values, a) if values
-          sql
-        end
-      end
-    end
-  end
-end

data/lib/arel/visitors/firebird.rb

@@ -1,79 +0,0 @@
-require 'arel/visitors/compat'
-
-module Arel
-  module Visitors
-    class Firebird < Arel::Visitors::ToSql
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_SelectStatement(o, a)
-          a = o.cores.inject(a) { |c, x| visit_Arel_Nodes_SelectCore(x, c) }
-
-          limit, offset = o.limit, o.offset
-          if limit || offset
-            select = a.parts[0]
-
-            sql = Arel::Collectors::SQLString.new
-            visit(limit, sql) if limit
-            if offset
-              sql << ' ' if limit
-              visit(offset, sql)
-            end
-
-            a.parts[0] = "#{select} #{sql.value}"
-          end
-
-          unless o.orders.empty?
-            a << ' ORDER BY '
-            last = o.orders.length - 1
-            o.orders.each_with_index do |x, i|
-              visit(x, a);  a << ', ' unless last == i
-            end
-          end
-
-          a
-        end
-
-        def visit_Arel_Nodes_Limit(o, a)
-          a << "FIRST #{limit_for(o)}"
-        end
-
-        def visit_Arel_Nodes_Offset(o, a)
-          a << 'SKIP '; visit(o.value, a)
-        end
-
-      else
-
-        def visit_Arel_Nodes_SelectStatement o, a = nil
-          if o.limit
-            limit = do_visit o.limit.expr, a
-          else
-            limit = nil
-          end
-          if o.offset
-            offset = do_visit o.offset.expr, a
-          else
-            offset = nil
-          end
-
-          sql = o.cores.map { |x| do_visit_select_core x, a }.join
-          @connection.insert_limit_offset!(sql, limit, offset) if limit || offset
-
-          unless o.orders.empty?
-            sql << ' ORDER BY '
-            last = o.orders.length - 1
-            o.orders.each_with_index do |x, i|
-              sql << do_visit(x, a);  sql << ', ' unless last == i
-            end
-          end
-
-          sql
-        end
-      end
-
-    end
-  end
-end
-
-Arel::Collectors::Bind.class_eval do
-  attr_reader :parts
-end if defined? Arel::Collectors::Bind