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

data/lib/arjdbc/derby/adapter.rb

@@ -65,25 +65,6 @@ module ArJdbc
         limit
       end
 
-      def simplified_type(field_type)
-        case field_type
-        when /^smallint/i    then Derby.emulate_booleans? ? :boolean : :integer
-        when /^bigint|int/i  then :integer
-        when /^real|double/i then :float
-        when /^dec/i         then # DEC is a DECIMAL alias
-          extract_scale(field_type) == 0 ? :integer : :decimal
-        when /^timestamp/i   then :datetime
-        when /^xml/i         then :xml
-        when 'long varchar'  then :text
-        when /for bit data/i then :binary
-        # :name=>"long varchar for bit data", :limit=>32700
-        # :name=>"varchar() for bit data", :limit=>32672
-        # :name=>"char() for bit data", :limit=>254}
-        else
-          super
-        end
-      end
-
       # Post process default value from JDBC into a Rails-friendly format (columns{-internal})
       def default_value(value)
         # JDBC returns column default strings with actual single quotes around the value.
@@ -420,7 +401,7 @@ module ArJdbc
 
     # @override
     def supports_ddl_transactions?; true end
- 
+
     # @override
     def supports_foreign_keys?; true end
 

data/lib/arjdbc/firebird/adapter.rb

@@ -38,27 +38,6 @@ module ArJdbc
           return $1 unless $1.upcase == 'NULL'
         end
       end
-
-      private
-
-      def simplified_type(field_type)
-        case field_type
-        when /timestamp/i    then :datetime
-        when /^smallint/i    then :integer
-        when /^bigint|int/i  then :integer
-        when /^double/i      then :float # double precision
-        when /^decimal/i     then
-          extract_scale(field_type) == 0 ? :integer : :decimal
-        when /^char\(1\)$/i  then Firebird.emulate_booleans? ? :boolean : :string
-        when /^char/i        then :string
-        when /^blob\ssub_type\s(\d)/i
-          return :binary if $1 == '0'
-          return :text   if $1 == '1'
-        else
-          super
-        end
-      end
-
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class

data/lib/arjdbc/h2/adapter.rb

@@ -47,21 +47,6 @@ module ArJdbc
         limit
       end
 
-      def simplified_type(field_type)
-        case field_type
-        when /^bit|bool/i         then :boolean
-        when /^signed|year/i      then :integer
-        when /^real|double/i      then :float
-        when /^varchar/i          then :string
-        when /^longvarchar/i      then :text
-        when /^binary|raw|bytea/i then :binary
-        when /varbinary/i         then :binary # longvarbinary, varbinary
-        when /^blob|image|oid/i   then :binary
-        else
-          super
-        end
-      end
-
       # Post process default value from JDBC into a Rails-friendly format (columns{-internal})
       def default_value(value)
         # H2 auto-generated key default value

data/lib/arjdbc/hsqldb/adapter.rb

@@ -42,20 +42,6 @@ module ArJdbc
         limit
       end
 
-      def simplified_type(field_type)
-        case field_type
-        when /^nvarchar/i    then :string
-        when /^character/i   then :string
-        when /^longvarchar/i then :text
-        when /int/i          then :integer # TINYINT, SMALLINT, BIGINT, INT
-        when /real|double/i  then :float
-        when /^bit/i         then :boolean
-        when /binary/i       then :binary # VARBINARY, LONGVARBINARY
-        else
-          super
-        end
-      end
-
       # Post process default value from JDBC into a Rails-friendly format (columns{-internal})
       def default_value(value)
         # JDBC returns column default strings with actual single quotes around the value.

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.rb

@@ -2,12 +2,8 @@ require 'active_support/deprecation'
 
 module ArJdbc
 
-  # @private
-  AR40 = ::ActiveRecord::VERSION::MAJOR > 3
   # @private
   AR42 = ::ActiveRecord::VERSION::STRING >= '4.2'
-  # @private
-  AR50 = ::ActiveRecord::VERSION::MAJOR > 4
 
   # @private
   AR52 = ::ActiveRecord::VERSION::STRING >= '5.2'

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
@@ -28,17 +30,13 @@ module ActiveRecord
 
         if ArJdbc::AR52
           # undefined method `cast' for #<ActiveRecord::ConnectionAdapters::SqlTypeMetadata> on AR52
-        elsif ArJdbc::AR50
+        else
           default = args[0].cast(default)
 
           sql_type = args.delete_at(1)
           type = args.delete_at(0)
 
           args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
-        elsif ArJdbc::AR42
-          default = args[0].type_cast_from_database(default)
-        else
-          default = default_value(default)
         end
 
         # super <= 4.1: (name, default, sql_type = nil, null = true)

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/mssql.rb

@@ -1,7 +1,9 @@
 require 'arjdbc'
 require 'arjdbc/mssql/adapter'
 require 'arjdbc/mssql/connection_methods'
+
 module ArJdbc
   MsSQL = MSSQL # compatibility with 1.2
 end
-ArJdbc.warn_unsupported_adapter 'mssql', [5, 2] # warns on AR >= 4.2
+
+ArJdbc.warn_unsupported_adapter 'mssql', [6, 0] # warns on AR >= 4.2

data/lib/arjdbc/mssql/adapter.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 ArJdbc.load_java_part :MSSQL
 
@@ -68,8 +68,19 @@ module ActiveRecord
         # configure_connection happens in super
         super(connection, logger, config)
 
-        unless mssql_major_version >= 11
-          raise "Your MSSQL #{mssql_version_year} is too old. This adapter supports MSSQL >= 2012."
+        if database_version < '11'
+          raise "Your #{mssql_product_name} #{mssql_version_year} is too old. This adapter supports #{mssql_product_name} >= 2012."
+        end
+      end
+
+      def self.database_exists?(config)
+        !!ActiveRecord::Base.sqlserver_connection(config)
+      rescue ActiveRecord::JDBCError => e
+        case e.message
+        when /Cannot open database .* requested by the login/
+          false
+        else
+          raise
         end
       end
 
@@ -101,6 +112,14 @@ module ActiveRecord
         true
       end
 
+      def supports_savepoints?
+        true
+      end
+
+      def supports_lazy_transactions?
+        true
+      end
+
       # The MSSQL datetime type doe have precision.
       def supports_datetime_with_precision?
         true
@@ -121,17 +140,35 @@ module ActiveRecord
         true
       end
 
+      def supports_insert_on_conflict?
+        false
+      end
+      alias supports_insert_on_duplicate_skip? supports_insert_on_conflict?
+      alias supports_insert_on_duplicate_update? supports_insert_on_conflict?
+      alias supports_insert_conflict_target? supports_insert_on_conflict?
+
+      def build_insert_sql(insert) # :nodoc:
+        # TODO: hope we can implement an upsert like feature
+        "INSERT #{insert.into} #{insert.values_list}"
+      end
+
       # Overrides abstract method which always returns false
       def valid_type?(type)
         !native_database_types[type].nil?
       end
 
-      # FIXME: to be reviewed.
       def clear_cache!
         reload_type_map
         super
       end
 
+      def reset!
+        # execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
+        # NOTE: it seems the above line interferes with the jdbc driver
+        # and ending up in connection closed, issue seen in rails 5.2 and 6.0
+        reconnect!
+      end
+
       def disable_referential_integrity
         tables = tables_with_referential_integrity
 
@@ -163,22 +200,6 @@ module ActiveRecord
         result
       end
 
-      def arel_visitor # :nodoc:
-        ::Arel::Visitors::SQLServer.new(self)
-      end
-
-      def schema_creation # :nodoc:
-        MSSQL::SchemaCreation.new(self)
-      end
-
-      def create_table_definition(*args) # :nodoc:
-        MSSQL::TableDefinition.new(*args)
-      end
-
-      def update_table_definition(table_name, base) #:nodoc:
-        MSSQL::Table.new(table_name, base)
-      end
-
       # Returns the name of the current security context
       def current_user
         @current_user ||= select_value('SELECT CURRENT_USER')
@@ -201,34 +222,34 @@ module ActiveRecord
 
       alias_method :current_schema=, :default_schema=
 
-      # Overrides method in abstract adapter
-      # FIXME: This needs to be fixed the we find a way how to
-      # get the collation per column basis. At the moment we only use
-      # the global database collation
-      def case_sensitive_comparison(table, attribute, column, value)
-        if [:string, :text].include?(column.type) && collation && !collation.match(/_CS/)
-          table[attribute].eq(Arel::Nodes::Bin.new(value))
-        # elsif value.acts_like?(:string)
-        #   table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new))
+      # 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:
+        column = column_for_attribute(attribute)
+
+        if [:string, :text].include?(column.type) && collation && !collation.match(/_CS/) && !value.nil?
+          # NOTE: there is a deprecation warning here in the mysql adapter
+          # no sure if it's required.
+          attribute.eq(Arel::Nodes::Bin.new(value))
         else
           super
         end
       end
 
-      def configure_connection
-        execute("SET LOCK_TIMEOUT #{lock_timeout}")
+      def case_sensitive_comparison(attribute, value)
+        column = column_for_attribute(attribute)
 
-        set_session_transaction_isolation
+        if [:string, :text].include?(column.type) && collation && !collation.match(/_CS/) && !value.nil?
+          attribute.eq(Arel::Nodes::Bin.new(value))
+        else
+          super
+        end
       end
 
-      def lock_timeout
-        timeout = config[:lock_timeout].to_i
+      def configure_connection
+        # Here goes initial settings per connection
 
-        if timeout.positive?
-          timeout
-        else
-          5_000
-        end
+        set_session_transaction_isolation
       end
 
       def set_session_transaction_isolation
@@ -251,6 +272,27 @@ module ActiveRecord
         MSSQL_VERSION_YEAR[mssql_major_version.to_i]
       end
 
+      def mssql_product_version
+        return @mssql_product_version if defined? @mssql_product_version
+
+        @mssql_product_version = @connection.database_product_version
+      end
+
+      def mssql_product_name
+        return @mssql_product_name if defined? @mssql_product_name
+
+        @mssql_product_name = @connection.database_product_name
+      end
+
+      def get_database_version # :nodoc:
+        MSSQLAdapter::Version.new(mssql_product_version)
+      end
+
+      def check_version # :nodoc:
+        # NOTE: hitting the database from here causes trouble when adapter
+        # uses JNDI or Data Source setup.
+      end
+
       def tables_with_referential_integrity
         schema_and_tables_sql = %(
           SELECT s.name, o.name
@@ -269,20 +311,22 @@ module ActiveRecord
 
       private
 
-      def translate_exception(exception, message)
+      def translate_exception(exception, message:, sql:, binds:)
         case message
         when /(cannot insert duplicate key .* with unique index) | (violation of unique key constraint)/i
-          RecordNotUnique.new(message)
+          RecordNotUnique.new(message, sql: sql, binds: binds)
         when /Lock request time out period exceeded/i
-          LockTimeout.new(message)
+          LockTimeout.new(message, sql: sql, binds: binds)
         when /The .* statement conflicted with the FOREIGN KEY constraint/
-          ActiveRecord::InvalidForeignKey.new(message)
+          InvalidForeignKey.new(message, sql: sql, binds: binds)
+        when /The .* statement conflicted with the REFERENCE constraint/
+          InvalidForeignKey.new(message, sql: sql, binds: binds)
         when /(String or binary data would be truncated)/i
-          ActiveRecord::ValueTooLong.new(message)
+          ValueTooLong.new(message, sql: sql, binds: binds)
         when /Cannot insert the value NULL into column .* does not allow nulls/
-          ActiveRecord::NotNullViolation.new(message)
+          NotNullViolation.new(message, sql: sql, binds: binds)
         when /Arithmetic overflow error converting expression/
-          ActiveRecord::RangeError.new(message)
+          RangeError.new(message, sql: sql, binds: binds)
         else
           super
         end
@@ -390,6 +434,28 @@ module ActiveRecord
         map.register_type 'ntext', MSSQL::Type::Ntext.new
         map.register_type 'image', MSSQL::Type::Image.new
       end
+
+      # Returns an array of Column objects for the table specified by +table_name+.
+      # See the concrete implementation for details on the expected parameter values.
+      # NOTE: This is ready, all implemented in the java part of adapter,
+      # it uses MSSQLColumn, SqlTypeMetadata, etc.
+      def column_definitions(table_name)
+       log('JDBC: GETCOLUMNS', 'SCHEMA') { @connection.columns(table_name) }
+      rescue => e
+        # raise translate_exception_class(e, nil)
+        # FIXME: this breaks one arjdbc test but fixes activerecord tests
+        # (table name alias). Also it behaves similarly to the CRuby adapter
+        # which returns an empty array too. (postgres throws a exception)
+        []
+      end
+
+      def arel_visitor # :nodoc:
+        ::Arel::Visitors::SQLServer.new(self)
+      end
+
+      def build_statement_pool
+        # NOTE: @statements is set in StatementCache module
+      end
     end
   end
 end