activerecord-jdbc-adapter 52.8-java → 60.0-java

data/lib/arjdbc/informix/adapter.rb

@@ -28,11 +28,6 @@ module ArJdbc
       end
     end
 
-    # @see ActiveRecord::ConnectionAdapters::JdbcColumn#column_types
-    def self.column_selector
-      [ /informix/i, lambda { |cfg, column| column.extend(ColumnMethods) } ]
-    end
-
     JdbcConnection = ::ActiveRecord::ConnectionAdapters::InformixJdbcConnection
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
@@ -45,20 +40,6 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::InformixColumn
     end
 
-    module ColumnMethods
-
-      private
-      # TODO: Test all Informix column types.
-      def simplified_type(field_type)
-        if field_type =~ /serial/i
-          :primary_key
-        else
-          super
-        end
-      end
-
-    end
-
     def modify_types(types)
       super(types)
       types[:primary_key] = "SERIAL PRIMARY KEY"
@@ -152,10 +133,6 @@ module ArJdbc
 end # module ::ArJdbc
 
 module ActiveRecord::ConnectionAdapters
-  class InformixColumn < JdbcColumn
-    include ::ArJdbc::Informix::ColumnMethods
-  end
-
   class InformixAdapter < JdbcAdapter
     include ::ArJdbc::Informix
   end

data/lib/arjdbc/jdbc/adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/version'
 require 'active_record/connection_adapters/abstract_adapter'
 
@@ -94,7 +96,7 @@ module ActiveRecord
         nil
       end
 
-      ADAPTER_NAME = 'JDBC'.freeze
+      ADAPTER_NAME = 'JDBC'
 
       # @return [String] the 'JDBC' adapter name.
       def adapter_name

data/lib/arjdbc/jdbc/adapter_require.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
 
   if defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0
@@ -43,4 +45,4 @@ module ActiveRecord
 
   end
 
-end
+end

data/lib/arjdbc/jdbc/base_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   class << Base
     m = Module.new do
@@ -12,4 +14,4 @@ module ActiveRecord
 
     self.prepend(m)
   end
-end
+end

data/lib/arjdbc/jdbc/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::ConnectionAdapters
   module Jdbc
     # ActiveRecord connection pool callbacks for JDBC.

data/lib/arjdbc/jdbc/column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Jdbc

data/lib/arjdbc/jdbc/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     # JDBC (connection) base class, custom adapters we support likely extend

data/lib/arjdbc/jdbc/connection_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArJdbc
   ConnectionMethods = ::ActiveRecord::ConnectionHandling
 

data/lib/arjdbc/jdbc/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   # Represents exceptions that have propagated up through the JDBC API.
   class JDBCError < WrappedDatabaseException

data/lib/arjdbc/jdbc/extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArJdbc
 
   # Defines an AR-JDBC extension. An extension consists of a declaration using

data/lib/arjdbc/jdbc/java.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'java'
 require 'arjdbc/jdbc/adapter_java'
 
@@ -10,4 +12,4 @@ module ActiveRecord
       Types = ::Java::JavaSql::Types
     end
   end
-end
+end

data/lib/arjdbc/jdbc/railtie.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'arjdbc/railtie'
-ArJdbc.deprecate "require 'arjdbc/railtie' instead of 'arjdbc/jdbc/railtie'"
+ArJdbc.deprecate "require 'arjdbc/railtie' instead of 'arjdbc/jdbc/railtie'"

data/lib/arjdbc/jdbc/rake_tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 load 'arjdbc/tasks.rb'
 
-ArJdbc.deprecate "load 'arjdbc/tasks.rb' instead of 'arjdbc/jdbc/rake_tasks.rb'"
+ArJdbc.deprecate "load 'arjdbc/tasks.rb' instead of 'arjdbc/jdbc/rake_tasks.rb'"

data/lib/arjdbc/jdbc/serialized_attributes_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'arjdbc/util/serialized_attributes'
 
-ArJdbc.deprecate "require 'arjdbc/util/serialized_attributes' instead of 'arjdbc/jdbc/serialized_attributes_helper'"
+ArJdbc.deprecate "require 'arjdbc/util/serialized_attributes' instead of 'arjdbc/jdbc/serialized_attributes_helper'"

data/lib/arjdbc/jdbc/type_cast.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/column'
 
 module ActiveRecord::ConnectionAdapters

data/lib/arjdbc/jdbc/type_converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     # I want to use JDBC's DatabaseMetaData#getTypeInfo to choose the best native types to

data/lib/arjdbc/mysql/adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ArJdbc.load_java_part :MySQL
 
 require 'bigdecimal'
@@ -19,7 +21,7 @@ module ActiveRecord
     remove_const(:Mysql2Adapter) if const_defined?(:Mysql2Adapter)
 
     class Mysql2Adapter < AbstractMysqlAdapter
-      ADAPTER_NAME = 'Mysql2'.freeze
+      ADAPTER_NAME = 'Mysql2'
 
       include Jdbc::ConnectionPoolCallbacks
 
@@ -32,21 +34,30 @@ module ActiveRecord
       include ArJdbc::MySQL
 
       def initialize(connection, logger, connection_parameters, config)
-        # workaround to skip version check on JNDI to be lazy, dummy version is high enough for Rails 5.0 - 6.0
-        is_jndi = ::ActiveRecord::ConnectionAdapters::JdbcConnection.jndi_config?(config)
-        @version = '8.1.5' if is_jndi
-
         super
 
-        # set to nil to have it lazy-load the real value when required
-        @version = nil if is_jndi
-
         @prepared_statements = false unless config.key?(:prepared_statements)
         # configure_connection taken care of at ArJdbc::Abstract::Core
       end
 
+      def self.database_exists?(config)
+        conn = ActiveRecord::Base.mysql2_connection(config)
+        conn && conn.really_valid?
+      rescue ActiveRecord::NoDatabaseError
+        false
+      ensure
+        conn.disconnect! if conn
+      end
+
+      def check_version
+        # for JNDI, don't check version as the whole connection should be lazy
+        return if ::ActiveRecord::ConnectionAdapters::JdbcConnection.jndi_config?(config)
+
+        super
+      end
+
       def supports_json?
-        !mariadb? && version >= '5.7.8'
+        !mariadb? && database_version >= '5.7.8'
       end
 
       def supports_comments?
@@ -61,6 +72,10 @@ module ActiveRecord
         true
       end
 
+      def supports_lazy_transactions?
+        true
+      end
+
       def supports_transaction_isolation?
         true
       end
@@ -71,6 +86,16 @@ module ActiveRecord
 
       # HELPER METHODS ===========================================
 
+      # from MySQL::DatabaseStatements
+      READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+        :begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback, :describe, :desc
+      ) # :nodoc:
+      private_constant :READ_QUERY
+
+      def write_query?(sql) # :nodoc:
+        !READ_QUERY.match?(sql)
+      end
+
       # Reloading the type map in abstract/statement_cache.rb blows up postgres
       def clear_cache!
         reload_type_map
@@ -136,7 +161,13 @@ module ActiveRecord
       private
 
       # e.g. "5.7.20-0ubuntu0.16.04.1"
-      def full_version; @full_version ||= @connection.full_version end
+      def full_version
+        schema_cache.database_version.full_version_string
+      end
+
+      def get_full_version
+        @full_version ||= @connection.full_version
+      end
 
       def jdbc_connection_class(spec)
         ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
@@ -152,15 +183,13 @@ module ActiveRecord
       end
 
       # FIXME: optimize insert_fixtures_set by using JDBC Statement.addBatch()/executeBatch()
-      def combine_multi_statements(total_sql)
-        total_sql
-      end
-
-      def with_multi_statements
-        yield
-      end
 
-      def discard_remaining_results
+      def combine_multi_statements(total_sql)
+        if total_sql.length == 1
+          total_sql.first
+        else
+          total_sql
+        end
       end
     end
   end

data/lib/arjdbc/mysql/connection_methods.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 ArJdbc::ConnectionMethods.module_eval do
   def mysql_connection(config)
-    config = config.deep_dup
     # NOTE: this isn't "really" necessary but Rails (in tests) assumes being able to :
     #   ActiveRecord::Base.mysql2_connection ActiveRecord::Base.configurations['arunit'].merge(database: ...)
     config = symbolize_keys_if_necessary(config)