activerecord-jdbc-alt-adapter 61.2.0-java → 70.0.0.rc2-java

data/lib/arel/visitors/sql_server.rb

@@ -11,44 +11,6 @@ module Arel
 
       private
 
-      def visit_Arel_Nodes_SelectStatement(*args) # [o] AR <= 4.0 [o, a] on 4.1
-        o, a = args.first, args.last
-
-        return _visit_Arel_Nodes_SelectStatement(*args) if ! o.limit && ! o.offset
-
-        unless o.orders.empty?
-          select_order_by = do_visit_columns o.orders, a, 'ORDER BY '
-        end
-
-        select_count = false; sql = ''
-        o.cores.each do |x|
-          x = x.dup
-          core_order_by = select_order_by || determine_order_by(x, a)
-          if select_count? x
-            x.projections = [
-              Arel::Nodes::SqlLiteral.new(core_order_by ? over_row_num(core_order_by) : '*')
-            ]
-            select_count = true
-          else
-            # NOTE: this should really be added here and we should built the
-            # wrapping SQL but than #replace_limit_offset! assumes it does that
-            # ... MS-SQL adapter code seems to be 'hacked' by a lot of people
-            #x.projections << Arel::Nodes::SqlLiteral.new over_row_num(order_by)
-          end
-          sql << do_visit_select_core(x, a)
-        end
-
-        #sql = "SELECT _t.* FROM (#{sql}) as _t WHERE #{get_offset_limit_clause(o)}"
-        select_order_by ||= "ORDER BY #{@connection.determine_order_clause(sql)}"
-        replace_limit_offset!(sql, limit_for(o.limit), o.offset && o.offset.value.to_i, select_order_by)
-
-        sql = "SELECT COUNT(*) AS count_id FROM (#{sql}) AS subquery" if select_count
-
-        add_lock!(sql, :lock => o.lock && true)
-
-        sql
-      end unless ArJdbc::AR42
-
       # @private
       MAX_LIMIT_VALUE = 9_223_372_036_854_775_807
 
@@ -60,14 +22,6 @@ module Arel
         super
       end
 
-      def visit_Arel_Nodes_Lock o, a = nil
-        # MS-SQL doesn't support "SELECT...FOR UPDATE".  Instead, it needs
-        # WITH(ROWLOCK,UPDLOCK) specified after each table in the FROM clause.
-        #
-        # we return nothing here and add the appropriate stuff with #add_lock!
-        #do_visit o.expr, a
-      end unless ArJdbc::AR42
-
       def visit_Arel_Nodes_Top o, a = nil
         # `top` wouldn't really work here:
         #   User.select("distinct first_name").limit(10)
@@ -76,29 +30,6 @@ module Arel
         a || ''
       end
 
-      def visit_Arel_Nodes_Limit o, a = nil
-        "TOP (#{do_visit o.expr, a})"
-      end unless ArJdbc::AR42
-
-      def visit_Arel_Nodes_Ordering o, a = nil
-        expr = do_visit o.expr, a
-        if o.respond_to?(:direction)
-          "#{expr} #{o.ascending? ? 'ASC' : 'DESC'}"
-        else
-          expr
-        end
-      end unless ArJdbc::AR42
-
-      def visit_Arel_Nodes_Bin o, a = nil
-        expr = o.expr; sql = do_visit expr, a
-        if expr.respond_to?(:val) && expr.val.is_a?(Numeric)
-          sql
-        else
-          sql << " #{::ArJdbc::MSSQL.cs_equality_operator} "
-          sql
-        end
-      end unless ArJdbc::AR42
-
       private
 
       def self.possibly_private_method_defined?(name)
@@ -140,25 +71,7 @@ module Arel
           visit(x, sql); sql << ', ' unless i == last
         end
         sql.value
-      end if ArJdbc::AR42
-
-      def do_visit_columns(colls, a, sql)
-        non_simple_order = /\sASC|\sDESC|\sCASE|\sCOLLATE|[\.,\[\(]/i # MIN(width)
-
-        last = colls.size - 1
-        colls.each_with_index do |x, i|
-          coll = do_visit(x, a)
-
-          if coll !~ non_simple_order && coll.to_i == 0
-            sql << @connection.quote_column_name(coll)
-          else
-            sql << coll
-          end
-
-          sql << ', ' unless i == last
-        end
-        sql
-      end if Arel::VERSION < '4.0.0'
+      end
 
       def over_row_num order_by
         "ROW_NUMBER() OVER (#{order_by}) as _row_num"
@@ -174,20 +87,6 @@ module Arel
         end
       end
 
-      def table_from_select_core core
-        table_finder = lambda do |x|
-          case x
-          when Arel::Table
-            x
-          when Arel::Nodes::SqlLiteral
-            Arel::Table.new(x, @engine)
-          when Arel::Nodes::Join
-            table_finder.call(x.left)
-          end
-        end
-        table_finder.call(core.froms)
-      end if ActiveRecord::VERSION::STRING < '3.2'
-
       def primary_key_from_table t
         return unless t
         return t.primary_key if t.primary_key
@@ -219,7 +118,7 @@ module Arel
       include ArJdbc::MSSQL::LimitHelpers::SqlServer2000ReplaceLimitOffset
     end
 
-    load 'arel/visitors/sql_server/ng42.rb' if ArJdbc::AR42
+    load 'arel/visitors/sql_server/ng42.rb'
 
   end
 end

data/lib/arjdbc/abstract/core.rb

@@ -34,7 +34,7 @@ module ArJdbc
         raw_connection.jdbc_connection(unwrap)
       end
 
-      protected
+      private
 
       def translate_exception_class(e, sql, binds)
         message = "#{e.class.name}: #{e.message}"
@@ -42,16 +42,19 @@ module ArJdbc
         exception = translate_exception(
           e, message: message, sql: sql, binds: binds
         )
-        exception.set_backtrace e.backtrace
+        exception.set_backtrace e.backtrace unless exception.equal?(e)
         exception
       end
 
+      Throwable = java.lang.Throwable
+      private_constant :Throwable
+
       def translate_exception(exception, message:, sql:, binds:)
         # override in derived class
 
         # we shall not translate native "Java" exceptions as they might
         # swallow an ArJdbc / driver bug into an AR::StatementInvalid !
-        return exception if exception.is_a?(Java::JavaLang::Throwable)
+        return exception if exception.is_a?(Throwable)
 
         case exception
           when SystemExit, SignalException, NoMemoryError then exception
@@ -61,14 +64,10 @@ module ArJdbc
         end
       end
 
-      def extract_raw_bind_values(binds)
-        binds.map(&:value_for_database)
-      end
-
       # this version of log() automatically fills type_casted_binds from binds if necessary
-      def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
+      def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil, async: false)
         if binds.any? && (type_casted_binds.nil? || type_casted_binds.empty?)
-          type_casted_binds = ->{ extract_raw_bind_values(binds) }
+          type_casted_binds = ->{ binds.map(&:value_for_database) } # extract_raw_bind_values
         end
         super
       end

data/lib/arjdbc/abstract/database_statements.rb

@@ -30,7 +30,7 @@ module ArJdbc
 
       # It appears that at this point (AR 5.0) "prepare" should only ever be true
       # if prepared statements are enabled
-      def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false)
+      def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false, async: false)
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -69,7 +69,7 @@ module ArJdbc
       end
       alias :exec_delete :exec_update
 
-      def execute(sql, name = nil)
+      def execute(sql, name = nil, async: false)
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -77,11 +77,11 @@ module ArJdbc
         materialize_transactions
         mark_transaction_written_if_write(sql)
 
-        log(sql, name) { @connection.execute(sql) }
+        log(sql, name, async: async) { @connection.execute(sql) }
       end
 
       # overridden to support legacy binds
-      def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil)
+      def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil, async: false)
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
         super
       end

data/lib/arjdbc/discover.rb

@@ -23,26 +23,6 @@ module ArJdbc
     require('arjdbc/sqlite3') || true if name =~ /sqlite/i
   end
   
-  # Other supported adapters :
-
-  extension :Derby do |name, config|
-    if name =~ /derby/i
-      require 'arjdbc/derby'
-
-      if config && config[:username].nil? # set the database schema name (:username) :
-        begin
-          ArJdbc.with_meta_data_from_data_source_if_any(config) do
-            |meta_data| config[:username] = meta_data.getUserName
-          end
-        rescue => e
-          ArJdbc.warn("failed to set :username from (Derby) database meda-data: #{e.inspect}")
-        end
-      end
-
-      true
-    end
-  end
-
   extension :H2 do |name|
     require('arjdbc/h2') || true if name =~ /\.h2\./i
   end
@@ -54,51 +34,4 @@ module ArJdbc
   extension :MSSQL do |name|
     require('arjdbc/mssql') || true if name =~ /sqlserver|tds|Microsoft SQL/i
   end
-
-  extension :DB2 do |name, config|
-    if name =~ /db2/i && name !~ /as\/?400/i && config[:url] !~ /^jdbc:derby:net:/
-      require 'arjdbc/db2'
-      true
-    end
-  end
-  
-  extension :AS400 do |name, config|
-    # The native JDBC driver always returns "DB2 UDB for AS/400"
-    if name =~ /as\/?400/i
-      require 'arjdbc/db2'
-      require 'arjdbc/db2/as400'
-      true
-    end
-  end
-
-  # NOTE: following ones are likely getting deprecated :
-  
-  extension :FireBird do |name|
-    if name =~ /firebird/i
-      require 'arjdbc/firebird'
-      true
-    end
-  end
-
-  extension :Sybase do |name|
-    if name =~ /sybase|tds/i
-      require 'arjdbc/sybase'
-      true
-    end
-  end
-  
-  extension :Informix do |name|
-    if name =~ /informix/i
-      require 'arjdbc/informix'
-      true
-    end
-  end
-
-  extension :Mimer do |name|
-    if name =~ /mimer/i
-      require 'arjdbc/mimer'
-      true
-    end
-  end
-  
 end

data/lib/arjdbc/hsqldb/adapter.rb

@@ -111,7 +111,7 @@ module ArJdbc
         if column_type == :time
           "'#{value.strftime("%H:%M:%S")}'"
         #elsif column_type == :timestamp # || column_type == :datetime
-          #value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+          #value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
           #"'#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{sprintf("%06d", value.usec)}'"
         else
           super
@@ -127,7 +127,7 @@ module ArJdbc
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf("%06d", value.usec)
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super

data/lib/arjdbc/jdbc/adapter.rb

@@ -431,12 +431,12 @@ module ActiveRecord
       private
 
       # Helper useful during {#quote} since AREL might pass in it's literals
-      # to be quoted, fixed since AREL 4.0.0.beta1 : http://git.io/7gyTig
+      # to be quoted, fixed since AREL 4.0.0.beta1 : https://github.com/rails/arel/commit/9c514f3
       def sql_literal?(value); ::Arel::Nodes::SqlLiteral === value; end
 
-      # Helper to get local/UTC time (based on `ActiveRecord::Base.default_timezone`).
+      # Helper to get local/UTC time (based on `ActiveRecord::default_timezone`).
       def get_time(value)
-        get = ::ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+        get = ::ActiveRecord.default_timezone == :utc ? :getutc : :getlocal
         value.respond_to?(get) ? value.send(get) : value
       end
 

data/lib/arjdbc/jdbc/adapter_require.rb

@@ -2,7 +2,9 @@
 
 module ActiveRecord
 
-  if defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0
+  if defined? ConnectionAdapters::ConnectionHandler # 6.1
+    ConnectionAdapters::ConnectionHandler
+  elsif defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0, # 5.x, # 6.0
     ConnectionAdapters::ConnectionSpecification::Resolver
   elsif defined? Base::ConnectionSpecification::Resolver # 3.2
     Base::ConnectionSpecification::Resolver

data/lib/arjdbc/jdbc/column.rb

@@ -28,21 +28,6 @@ module ActiveRecord
           end
         end
 
-        if ArJdbc::AR52
-          # undefined method `cast' for #<ActiveRecord::ConnectionAdapters::SqlTypeMetadata> on AR52
-        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))
-        end
-
-        # super <= 4.1: (name, default, sql_type = nil, null = true)
-        # super >= 4.2: (name, default, cast_type, sql_type = nil, null = true)
-        # super >= 5.0: (name, default, sql_type_metadata = nil, null = true)
-
         super(name, default, *args)
         init_column(name, default, *args)
       end
@@ -80,18 +65,8 @@ module ActiveRecord
       end
 
       class << self
-
-        include Jdbc::TypeCast if ::ActiveRecord::VERSION::STRING >= '4.2'
-
-        if ActiveRecord::VERSION::MAJOR > 3 && ActiveRecord::VERSION::STRING < '4.2'
-
-          # @private provides compatibility between AR 3.x/4.0 API
-          def string_to_date(value); value_to_date(value) end
-
-        end
-
+        include Jdbc::TypeCast
       end
-
     end
   end
 end

data/lib/arjdbc/jdbc/type_cast.rb

@@ -130,9 +130,9 @@ module ActiveRecord::ConnectionAdapters
             return nil unless time
 
             time -= offset
-            ActiveRecord::Base.default_timezone == :utc ? time : time.getlocal
+            ActiveRecord.default_timezone == :utc ? time : time.getlocal
           else
-            timezone = ActiveRecord::Base.default_timezone
+            timezone = ActiveRecord.default_timezone
             Time.public_send(timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
           end
         end

data/lib/arjdbc/jdbc.rb

@@ -1,13 +1,6 @@
 require 'active_support/deprecation'
 
 module ArJdbc
-
-  # @private
-  AR42 = ::ActiveRecord::VERSION::STRING >= '4.2'
-
-  # @private
-  AR52 = ::ActiveRecord::VERSION::STRING >= '5.2'
-
   class << self
 
     # @private Internal API