activerecord-jdbc-adapter 70.0.pre-java → 70.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0552eaeb2b86ff8a8a2e24e86c56315c059dff050596c329cb5a082ad9d0c460
-  data.tar.gz: 12c7b5068269990ed27e15e7ef0d97ba0928a7bbcfbc6ca2cc6aa3e854d780ba
+  metadata.gz: 91bed685b2bb3b78dbf3ddc464f79e8c8023a3f9790c96c498e77398a3e589b1
+  data.tar.gz: d6056d03d71a6558172737f827429e379d8f855d74b9a091ca78623646c68dff
 SHA512:
-  metadata.gz: 90f35907b970e53e8c3910cf7d6e572a33d78270ab7002ad7c10170bdff4872d8784bf4d361b6ef5d1dda397387e5e2804fabee549b195e594178ba7bcfa7b97
-  data.tar.gz: 10be265dd0aab6905de89bb779b1aa653e004e0ed0d5a536c4a54ca876b2dc806c17da8d36b2a15c1852c97e87305b29edc99c5e05e2d946f43e44202a989288
+  metadata.gz: d8154960b44d44a8419ab4f57e5e3d9ffc622245472f9c23de709d38bb0745d593dfa3a8477e90c71c0547f18a0dc94a6a8d2fb97c65a59e18fdede3eb526b47
+  data.tar.gz: e4db4d37e11007a182f091995550c5cc74897183c9732faab755dc08e39f95f489459350bb8857d2d1936e93f2cad8cb199889107204ac8f93b6fc21855c374f

data/Rakefile

@@ -26,7 +26,7 @@
 
 require 'rake/clean'
 
-CLEAN.include 'derby*', 'test.db.*', '*test.sqlite3', 'test/reports'
+CLEAN.include 'test.db.*', '*test.sqlite3', 'test/reports'
 CLEAN.include 'lib/**/*.jar', 'MANIFEST.MF', '*.log', 'target/*'
 
 task :default => :jar # RubyGems extention will do a bare `rake' e.g. :

data/activerecord-jdbc-adapter.gemspec

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-path = File.expand_path('lib/arjdbc/version.rb', File.dirname(__FILE__))
-puts "VERSION: #{File.read(path).match( /.*VERSION\s*=\s*['"](.*)['"]/m )[1]}"
 Gem::Specification.new do |gem|
   gem.name = 'activerecord-jdbc-adapter'
   path = File.expand_path('lib/arjdbc/version.rb', File.dirname(__FILE__))
@@ -49,6 +47,6 @@ Gem::Specification.new do |gem|
   #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"]
 end
 

data/lib/arel/visitors/compat.rb

@@ -4,44 +4,16 @@ module Arel
 
       protected
 
-      if ToSql.instance_method('visit').arity == 1
-        def do_visit(x, a); visit(x); end # a = nil
-      else # > AREL 4.0
-        def do_visit(x, a); visit(x, a); end
-      end
+      def do_visit(x, a); visit(x, a); end
 
-      if ToSql.instance_method('visit_Arel_Nodes_SelectCore').arity == 1
-        def do_visit_select_core(x, a) # a = nil
-          visit_Arel_Nodes_SelectCore(x)
-        end
-      else # > AREL 4.0
-        def do_visit_select_core(x, a)
-          visit_Arel_Nodes_SelectCore(x, a)
-        end
+      def do_visit_select_core(x, a)
+        visit_Arel_Nodes_SelectCore(x, a)
       end
 
       private
 
-      if ArJdbc::AR42
-        if Arel::VERSION < '6.0.2'
-          def limit_for(limit_or_node)
-            if limit_or_node.respond_to?(:expr)
-              expr = limit_or_node.expr
-              # NOTE(uwe): Different behavior for Arel 6.0.0 and 6.0.2
-              expr.respond_to?(:value) ? expr.value.to_i : expr.to_i
-            else
-              limit_or_node
-            end
-          end
-        else
-          def limit_for(limit_or_node)
-            limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
-          end
-        end
-      else
-        def limit_for(limit_or_node)
-          limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
-        end
+      def limit_for(limit_or_node)
+        limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
       end
       module_function :limit_for
 

data/lib/arel/visitors/h2.rb

@@ -7,19 +7,7 @@ module Arel
       def visit_Arel_Nodes_SelectStatement(o, *)
         o.limit ||= Arel::Nodes::Limit.new(-1) if o.offset
         super
-      end if ArJdbc::AR42
-
-      def limit_offset sql, o
-        offset = o.offset || 0
-        offset = offset.expr unless (offset.nil? || offset == 0)
-        if limit = o.limit
-          "SELECT LIMIT #{offset} #{limit_for(limit)} #{sql[7..-1]}"
-        elsif offset > 0
-          "SELECT LIMIT #{offset} -1 #{sql[7..-1]}" # removes "SELECT "
-        else
-          sql
-        end
-      end unless ArJdbc::AR42
+      end
     end
   end
 end

data/lib/arel/visitors/hsqldb.rb

@@ -6,27 +6,7 @@ module Arel
       def visit_Arel_Nodes_SelectStatement(o, *)
         o.limit ||= Arel::Nodes::Limit.new(0) if o.offset
         super
-      end if ArJdbc::AR42
-
-      def visit_Arel_Nodes_SelectStatement o, a = nil
-        sql = limit_offset(o.cores.map { |x| do_visit_select_core x, a }.join, o)
-        sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
-        sql
-      end unless ArJdbc::AR42
-
-      private
-
-      def limit_offset sql, o
-        offset = o.offset || 0
-        offset = offset.expr unless (offset.nil? || offset == 0)
-        if limit = o.limit
-          "SELECT LIMIT #{offset} #{limit_for(limit)} #{sql[7..-1]}"
-        elsif offset > 0
-          "SELECT LIMIT #{offset} 0 #{sql[7..-1]}" # removes "SELECT "
-        else
-          sql
-        end
-      end unless ArJdbc::AR42
+      end
     end
   end
 end

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

@@ -10,6 +10,8 @@ module ArJdbc
       NO_BINDS = [].freeze
 
       def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil)
+        sql = transform_query(sql)
+
         if preventing_writes?
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -31,6 +33,8 @@ 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, async: false)
+        sql = transform_query(sql)
+
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -52,6 +56,8 @@ module ArJdbc
       end
 
       def exec_update(sql, name = nil, binds = NO_BINDS)
+        sql = transform_query(sql)
+
         if preventing_writes?
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -70,6 +76,8 @@ module ArJdbc
       alias :exec_delete :exec_update
 
       def execute(sql, name = nil, async: false)
+        sql = transform_query(sql)
+        
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         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/jdbc/adapter.rb

@@ -431,7 +431,7 @@ 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::default_timezone`).

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

data/lib/arjdbc/mysql/adapter.rb

@@ -107,7 +107,8 @@ module ActiveRecord
 
       # Reloading the type map in abstract/statement_cache.rb blows up postgres
       def clear_cache!
-        reload_type_map
+        # FIXME: This seems to have disappeared in Rails 7?
+        # reload_type_map
         super
       end
 

data/lib/arjdbc/mysql/connection_methods.rb

@@ -126,51 +126,52 @@ ArJdbc::ConnectionMethods.module_eval do
 
   private
 
-  @@mysql_encodings = nil
+  MYSQL_ENCODINGS = {
+    "big5" => "Big5",
+    "dec8" => nil,
+    #"cp850" => "Cp850",
+    "hp8" => nil,
+    #"koi8r" => "KOI8-R",
+    "latin1" => "Cp1252",
+    "latin2" => "ISO8859_2",
+    "swe7" => nil,
+    "ascii" => "US-ASCII",
+    "ujis" => "EUC_JP",
+    "sjis" => "SJIS",
+    "hebrew" => "ISO8859_8",
+    "tis620" => "TIS620",
+    "euckr" => "EUC_KR",
+    #"koi8u" => "KOI8-R",
+    "gb2312" => "EUC_CN",
+    "greek" => "ISO8859_7",
+    "cp1250" => "Cp1250",
+    "gbk" => "GBK",
+    #"latin5" => "ISO-8859-9",
+    "armscii8" => nil,
+    "ucs2" => "UnicodeBig",
+    "cp866" => "Cp866",
+    "keybcs2" => nil,
+    "macce" => "MacCentralEurope",
+    "macroman" => "MacRoman",
+    #"cp852" => "CP852",
+    #"latin7" => "ISO-8859-13",
+    "cp1251" => "Cp1251",
+    "cp1256" => "Cp1256",
+    "cp1257" => "Cp1257",
+    "binary" => false,
+    "geostd8" => nil,
+    "cp932" => "Cp932",
+    #"eucjpms" => "eucJP-ms"
+    "utf8" => "UTF-8",
+    "utf8mb4" => false,
+    "utf16" => false,
+    "utf32" => false,
+  }
+
 
   # @see https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-reference-charsets.html
   def convert_mysql_encoding(encoding) # to charset-name (characterEncoding=...)
-    ( @@mysql_encodings ||= {
-      "big5" => "Big5",
-      "dec8" => nil,
-      #"cp850" => "Cp850",
-      "hp8" => nil,
-      #"koi8r" => "KOI8-R",
-      "latin1" => "Cp1252",
-      "latin2" => "ISO8859_2",
-      "swe7" => nil,
-      "ascii" => "US-ASCII",
-      "ujis" => "EUC_JP",
-      "sjis" => "SJIS",
-      "hebrew" => "ISO8859_8",
-      "tis620" => "TIS620",
-      "euckr" => "EUC_KR",
-      #"koi8u" => "KOI8-R",
-      "gb2312" => "EUC_CN",
-      "greek" => "ISO8859_7",
-      "cp1250" => "Cp1250",
-      "gbk" => "GBK",
-      #"latin5" => "ISO-8859-9",
-      "armscii8" => nil,
-      "ucs2" => "UnicodeBig",
-      "cp866" => "Cp866",
-      "keybcs2" => nil,
-      "macce" => "MacCentralEurope",
-      "macroman" => "MacRoman",
-      #"cp852" => "CP852",
-      #"latin7" => "ISO-8859-13",
-      "cp1251" => "Cp1251",
-      "cp1256" => "Cp1256",
-      "cp1257" => "Cp1257",
-      "binary" => false,
-      "geostd8" => nil,
-      "cp932" => "Cp932",
-      #"eucjpms" => "eucJP-ms"
-      "utf8" => "UTF-8",
-      "utf8mb4" => false,
-      "utf16" => false,
-      "utf32" => false,
-    } )[ encoding ]
+    MYSQL_ENCODINGS[ encoding ]
   end
 
 end