activerecord-jdbc-adapter 1.3.25 → 5.0.pre1

data/lib/arjdbc/db2/as400.rb

@@ -13,9 +13,6 @@ module ArJdbc
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
     def self.jdbc_connection_class; DB2.jdbc_connection_class; end
 
-    # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
-    def self.arel_visitor_type(config = nil); DB2.arel_visitor_type(config); end
-
     def self.column_selector
       [ /as400/i, lambda { |config, column| column.extend(Column) } ]
     end
@@ -60,11 +57,8 @@ module ArJdbc
         @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*SYSRPYL)',0000000031.00000)"
         @connection.execute_update "call qsys.qcmdexc('ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY(''I'')',0000000045.00000)"
       rescue Exception => e
-        # Sometimes the exception can be a false-positive when we already ran the second command
-        unless e.message.include? 'Sequence number 9876 already defined in system reply list.'
-          raise "Could not call CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I').\n" +
-                    "Do you have authority to do this?\n\n#{e.inspect}"
-        end
+        raise "Could not call CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I').\n" +
+              "Do you have authority to do this?\n\n#{e.inspect}"
       end
 
       begin
@@ -103,11 +97,6 @@ module ArJdbc
       true
     end
 
-    # AS400 does not support TRUNCATE command. Deleting everything from the table is should be close enough
-    def truncate(table_name, name = nil)
-      @connection.execute_update "DELETE FROM #{table_name}"
-    end
-
     private
 
     # @override

data/lib/arjdbc/db2/column.rb

@@ -47,7 +47,7 @@ module ArJdbc
 
       # @override
       def type_cast(value)
-        return nil if value.nil? || value.eql?('NULL') || value =~ /^\s*NULL\s*$/i
+        return nil if value.nil? || value == 'NULL' || value =~ /^\s*NULL\s*$/i
         case type
         when :string    then value
         when :integer   then value.respond_to?(:to_i) ? value.to_i : (value ? 1 : 0)

data/lib/arjdbc/derby/adapter.rb

@@ -2,6 +2,7 @@ ArJdbc.load_java_part :Derby
 
 require 'arjdbc/util/table_copier'
 require 'arjdbc/derby/schema_creation' # AR 4.x
+require 'arel/visitors/derby'
 
 module ArJdbc
   module Derby
@@ -93,11 +94,6 @@ module ArJdbc
 
     end
 
-    # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
-    def self.arel_visitor_type(config = nil)
-      require 'arel/visitors/derby'; ::Arel::Visitors::Derby
-    end
-
     ADAPTER_NAME = 'Derby'.freeze
 
     def adapter_name
@@ -511,7 +507,7 @@ module ArJdbc
     # Returns the value of an identity column of the last *INSERT* statement
     # made over this connection.
     # @note Check the *IDENTITY_VAL_LOCAL* function for documentation.
-    # @return [Integer]
+    # @return [Fixnum]
     def last_insert_id
       @connection.identity_val_local
     end

data/lib/arjdbc/firebird/adapter.rb

@@ -1,5 +1,7 @@
 ArJdbc.load_java_part :Firebird
 
+require 'arel/visitors/firebird'
+
 module ArJdbc
   module Firebird
 
@@ -62,16 +64,6 @@ module ArJdbc
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
     def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::FirebirdColumn end
 
-    # @see ArJdbc::ArelHelper::ClassMethods#arel_visitor_type
-    def self.arel_visitor_type(config = nil)
-      require 'arel/visitors/firebird'; ::Arel::Visitors::Firebird
-    end
-
-    # @deprecated no longer used
-    def self.arel2_visitors(config = nil)
-      { 'firebird' => arel_visitor_type, 'firebirdsql' => arel_visitor_type }
-    end
-
     # @private
     @@emulate_booleans = true
 
@@ -224,11 +216,6 @@ module ArJdbc
       true
     end
 
-    # Does this adapter support using DISTINCT within COUNT?
-    def supports_count_distinct?
-      true
-    end
-
     # Does this adapter support DDL rollbacks in transactions? That is, would
     # CREATE TABLE or ALTER TABLE get rolled back by a transaction? PostgreSQL,
     # SQL Server, and others support this. MySQL and others do not.
@@ -354,7 +341,7 @@ module ArJdbc
       when NilClass then 'NULL'
       when TrueClass then (type == :integer ? '1' : quoted_true)
       when FalseClass then (type == :integer ? '0' : quoted_false)
-      when Float, Integer then value.to_s
+      when Float, Fixnum, Bignum then value.to_s
       # BigDecimals need to be output in a non-normalized form and quoted.
       when BigDecimal then value.to_s('F')
       when Symbol then "'#{quote_string(value.to_s)}'"
@@ -434,6 +421,10 @@ module ActiveRecord::ConnectionAdapters
       super
     end
 
+    def arel_visitor
+      Arel::Visitors::Firebird.new(self)
+    end
+
   end
 
   class FirebirdColumn < JdbcColumn

data/lib/arjdbc/h2/adapter.rb

@@ -1,5 +1,6 @@
 ArJdbc.load_java_part :H2
 require 'arjdbc/hsqldb/adapter'
+require 'arel/visitors/h2'
 
 module ArJdbc
   module H2
@@ -10,11 +11,6 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::H2JdbcConnection
     end
 
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
-    def jdbc_column_class
-      ::ActiveRecord::ConnectionAdapters::H2Column
-    end
-
     # @see ActiveRecord::ConnectionAdapters::JdbcColumn#column_types
     def self.column_selector
       [ /\.h2\./i, lambda { |config, column| column.extend(Column) } ]
@@ -77,11 +73,6 @@ module ArJdbc
 
     end
 
-    # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
-    def self.arel_visitor_type(config = nil)
-      require 'arel/visitors/h2'; ::Arel::Visitors::H2
-    end
-
     ADAPTER_NAME = 'H2'.freeze
 
     # @override
@@ -303,10 +294,10 @@ module ActiveRecord::ConnectionAdapters
 
   class H2Adapter < JdbcAdapter
     include ArJdbc::H2
-  end
 
-  class H2Column < JdbcColumn
-    include ::ArJdbc::H2::Column
+    def arel_visitor
+      Arel::Visitors::H2.new(self)
+    end
   end
 
 end

data/lib/arjdbc/hsqldb/adapter.rb

@@ -1,6 +1,7 @@
 ArJdbc.load_java_part :HSQLDB
 require 'arjdbc/hsqldb/explain_support'
 require 'arjdbc/hsqldb/schema_creation' # AR 4.x
+require 'arel/visitors/hsqldb'
 
 module ArJdbc
   module HSQLDB
@@ -64,11 +65,6 @@ module ArJdbc
 
     end
 
-    # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
-    def self.arel_visitor_type(config = nil)
-      require 'arel/visitors/hsqldb'; ::Arel::Visitors::HSQLDB
-    end
-
     ADAPTER_NAME = 'HSQLDB'.freeze
 
     def adapter_name
@@ -291,6 +287,10 @@ module ActiveRecord::ConnectionAdapters
 
   class HsqldbAdapter < JdbcAdapter
     include ArJdbc::HSQLDB
+
+    def arel_visitor # :nodoc:
+      Arel::Visitors::HSQLDB
+    end
   end
 
 end

data/lib/arjdbc/jdbc/adapter.rb

@@ -8,7 +8,6 @@ require 'arjdbc/jdbc/connection_methods'
 require 'arjdbc/jdbc/driver'
 require 'arjdbc/jdbc/column'
 require 'arjdbc/jdbc/connection'
-require 'arjdbc/jdbc/arel_support'
 require 'arjdbc/jdbc/callbacks'
 require 'arjdbc/jdbc/extension'
 require 'arjdbc/jdbc/type_converter'
@@ -33,12 +32,9 @@ module ActiveRecord
     # compatibility with native (MRI) adapters it's perfectly fine to sub-class
     # the adapter and override some of its API methods.
     class JdbcAdapter < AbstractAdapter
-      extend ShadowCoreMethods
-
-      include Jdbc::ArelSupport
       include Jdbc::ConnectionPoolCallbacks
 
-      attr_reader :config
+      attr_reader :config, :prepared_statements
 
       def self.new(connection, logger = nil, pool = nil)
         adapter = super
@@ -55,14 +51,13 @@ module ActiveRecord
       # @param logger the `ActiveRecord::Base.logger` to use (or nil)
       # @param config the database configuration
       # @note `initialize(logger, config)` with 2 arguments is supported as well
-      def initialize(connection, logger, config = nil)
-        # AR : initialize(connection, logger = nil, pool = nil)
-        # AR < 3.2 : initialize(connection, logger = nil)
-        if config.nil? && logger.respond_to?(:key?) # (logger, config)
-          config, logger, connection = logger, connection, nil
-        end
-
+      def initialize(connection, logger = nil, config = nil)
         @config = config.respond_to?(:symbolize_keys) ? config.symbolize_keys : config
+        # FIXME: Rails 5 defaults to prepared statements on and we do not seem
+        # to work yet.  So default to off unless it is requested until that is
+        # fixed.
+        @config[:prepared_statements] = false if !@config[:prepared_statements]
+
         # NOTE: JDBC 4.0 drivers support checking if connection isValid
         # thus no need to @config[:connection_alive_sql] ||= 'SELECT 1'
         #
@@ -75,7 +70,7 @@ module ActiveRecord
         # NOTE: adapter spec's init_connection only called if instantiated here :
         connection ||= jdbc_connection_class(spec).new(@config, self)
 
-        super(connection, logger)
+        super(connection, logger, @config)
 
         # kind of like `extend ArJdbc::MyDB if self.class == JdbcAdapter` :
         klass = @config[:adapter_class]
@@ -83,8 +78,6 @@ module ActiveRecord
 
         # NOTE: should not be necessary for JNDI due reconnect! on checkout :
         configure_connection if respond_to?(:configure_connection)
-
-        @visitor = new_visitor # nil if no AREL (AR-2.3)
       end
 
       # Returns the (JDBC) connection class to be used for this adapter.
@@ -296,40 +289,15 @@ module ActiveRecord
 
       # @override
       def reconnect!
-        super # clear_cache! && reset_transaction
         @connection.reconnect! # handles adapter.configure_connection
         @connection
       end
 
       # @override
       def disconnect!
-        super # clear_cache! && reset_transaction
-        return unless @connection
         @connection.disconnect!
       end
 
-      if ActiveRecord::VERSION::MAJOR < 3
-
-        # @private
-        def jdbc_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
-          insert_sql(sql, name, pk, id_value, sequence_name)
-        end
-        alias_chained_method :insert, :query_dirty, :jdbc_insert
-
-        # @private
-        def jdbc_update(sql, name = nil, binds = [])
-          execute(sql, name, binds)
-        end
-        alias_chained_method :update, :query_dirty, :jdbc_update
-
-        # @private
-        def jdbc_select_all(sql, name = nil, binds = [])
-          select(sql, name, binds)
-        end
-        alias_chained_method :select_all, :query_cache, :jdbc_select_all
-
-      end
-
       # @note Used on AR 2.3 and 3.0
       # @override
       def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
@@ -575,20 +543,6 @@ module ActiveRecord
         end
       end
 
-      # @private documented above
-      def execute(sql, name = nil, skip_logging = false)
-        if skip_logging.is_a?(Array)
-          binds, skip_logging = skip_logging, false
-          sql = suble_binds to_sql(sql, binds), binds
-        end
-        if skip_logging || name == :skip_logging
-          _execute(sql, name)
-        else
-          log(sql, name) { _execute(sql, name) }
-        end
-      end if ActiveRecord::VERSION::MAJOR < 3 ||
-        ( ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0 )
-
       # We need to do it this way, to allow Rails stupid tests to always work
       # even if we define a new `execute` method. Instead of mixing in a new
       # `execute`, an `_execute` should be mixed in.
@@ -759,7 +713,11 @@ module ActiveRecord
       # @note AR-4x arguments expected: `(name, temporary, options)`
       # @private documented bellow
       def new_table_definition(table_definition, *args)
-        table_definition.new native_database_types, *args
+        if ActiveRecord::VERSION::MAJOR > 4
+          table_definition.new(*args)
+        else
+          table_definition.new native_database_types, *args
+        end
       end
       private :new_table_definition
 
@@ -829,28 +787,16 @@ module ActiveRecord
             false # off by default - NOTE: on AR 4.x it's on by default !?
       end
 
-      if @@suble_binds = ENV_JAVA['arjdbc.adapter.suble_binds']
+      if @@suble_binds = Java::JavaLang::System.getProperty('arjdbc.adapter.suble_binds')
         @@suble_binds = Java::JavaLang::Boolean.parseBoolean(@@suble_binds)
       else
         @@suble_binds = ActiveRecord::VERSION::MAJOR < 4 # due compatibility
       end
       def self.suble_binds?; @@suble_binds; end
-      def self.suble_binds=(flag); @@suble_binds = flag; end # remove on 1.4
+      def self.suble_binds=(flag); @@suble_binds = flag; end
 
       private
 
-      # @note Since AR 4.0 we (finally) do not "sub" SQL's '?' parameters !
-      # @deprecated This should go away (hopefully), now here due 1.2.x.
-      def suble_binds(sql, binds)
-        return sql if ! @@suble_binds || binds.nil? || binds.empty?
-        binds = binds.dup; warn = nil
-        result = sql.gsub('?') { warn = true; quote(*binds.shift.reverse) }
-        ActiveSupport::Deprecation.warn(
-          "string binds substitution is deprecated - please refactor your sql", caller[1..-1]
-        ) if warn
-        result
-      end
-
       # @private Supporting "string-subling" on AR 4.0 would require {#to_sql}
       # to consume binds parameters otherwise it happens twice e.g. for a record
       # insert it is called during {#insert} as well as on {#exec_insert} ...
@@ -858,13 +804,6 @@ module ActiveRecord
       # array and run a query again since it's the very same instance on 4.0 !
       def suble_binds(sql, binds)
         sql
-      end if ActiveRecord::VERSION::MAJOR > 3
-
-      # @deprecated No longer used, will be removed.
-      # @see #suble_binds
-      def substitute_binds(sql, binds)
-        return sql if binds.nil? || binds.empty?; binds = binds.dup
-        extract_sql(sql).gsub('?') { quote(*binds.shift.reverse) }
       end
 
       # @deprecated No longer used, kept for 1.2 API compatibility.

data/lib/arjdbc/jdbc/adapter_require.rb

@@ -23,43 +23,24 @@ module ActiveRecord
       #  adapters) would be to mingle with the $LOAD_PATH which seems worse ...
       case path
       when 'active_record/connection_adapters/mysql_adapter'
-        if !$LOADED_FEATURES.include?('active_record/connection_adapters/mysql_adapter.rb')
-          $LOADED_FEATURES << 'active_record/connection_adapters/mysql_adapter.rb'
-          super('arjdbc/mysql')
-        else
-          false
-        end
+        $LOADED_FEATURES << 'active_record/connection_adapters/mysql_adapter.rb'
+        super('arjdbc/mysql')
       when 'active_record/connection_adapters/mysql2_adapter'
-        if !$LOADED_FEATURES.include?('active_record/connection_adapters/mysql2_adapter.rb')
-          $LOADED_FEATURES << 'active_record/connection_adapters/mysql2_adapter.rb'
-          super('arjdbc/mysql')
-        else
-          false
-        end
+        $LOADED_FEATURES << 'active_record/connection_adapters/mysql2_adapter.rb'
+        super('arjdbc/mysql')
       when 'active_record/connection_adapters/postgresql_adapter'
-        if !$LOADED_FEATURES.include?('active_record/connection_adapters/postgresql_adapter.rb')
-          $LOADED_FEATURES << 'active_record/connection_adapters/postgresql_adapter.rb'
-          super('arjdbc/postgresql')
-        else
-          false
-        end
+        $LOADED_FEATURES << 'active_record/connection_adapters/postgresql_adapter.rb'
+        super('arjdbc/postgresql')
       when 'active_record/connection_adapters/sqlite_adapter'
-        if !$LOADED_FEATURES.include?('active_record/connection_adapters/sqlite_adapter.rb')
-          $LOADED_FEATURES << 'active_record/connection_adapters/sqlite_adapter.rb'
-          super('arjdbc/sqlite3')
-        else
-          false
-        end
+        $LOADED_FEATURES << 'active_record/connection_adapters/sqlite_adapter.rb'
+        super('arjdbc/sqlite3')
       when 'active_record/connection_adapters/sqlite3_adapter'
-        if !$LOADED_FEATURES.include?('active_record/connection_adapters/sqlite3_adapter.rb')
-          $LOADED_FEATURES << 'active_record/connection_adapters/sqlite3_adapter.rb'
-          super('arjdbc/sqlite3')
-        else
-          false
-        end
+        $LOADED_FEATURES << 'active_record/connection_adapters/sqlite3_adapter.rb'
+        super('arjdbc/sqlite3')
       else super
       end
     end
+
   end
 
-end
+end

data/lib/arjdbc/jdbc/base_ext.rb

@@ -1,18 +1,16 @@
 module ActiveRecord
-  # ActiveRecord::Base extensions.
-  Base.class_eval do
-    class << self
+  class << Base
+    m = Module.new do
       # Allow adapters to provide their own {#reset_column_information} method.
       # @note This only affects the current thread's connection.
-      def reset_column_information_with_arjdbc # :nodoc:
+      def reset_column_information # :nodoc:
         # invoke the adapter-specific reset_column_information method
         connection.reset_column_information if connection.respond_to?(:reset_column_information)
-        reset_column_information_without_arjdbc
-      end
-      unless method_defined?("reset_column_information_without_arjdbc")
-        alias_method_chain :reset_column_information, :arjdbc
+        super
       end
     end
+
+    self.prepend(m)
   end
 
   # Represents exceptions that have propagated up through the JDBC API.
@@ -43,21 +41,4 @@ module ActiveRecord
     end
 
   end
-  
-  module ConnectionAdapters
-    # Allows properly re-defining methods that may already be alias-chain-ed.
-    # Query caching works even with overriden alias_method_chain'd methods.
-    # @private
-    module ShadowCoreMethods
-      def alias_chained_method(name, feature, target)
-        # NOTE: aliasing for things such as columns (with feature query_cache)
-        # seems to only be used for 2.3 since 3.0 methods are not aliased ...
-        if method_defined?(method = "#{name}_without_#{feature}")
-          alias_method method, target
-        else
-          alias_method name, target if name.to_s != target.to_s
-        end
-      end
-    end
-  end
 end