activerecord-jdbc-adapter 52.1-java → 52.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce3b01a3484aa192fc9a22b788e3117aa44adedd
-  data.tar.gz: 48b8197f1de856fe9994bfdf798c078eb92b6e2d
+SHA256:
+  metadata.gz: edf65c8d44c40981f576b4b4e771621266594633377cdb3e4372c3f6d0f21d95
+  data.tar.gz: 73cb6e5361a6f7bd99eb0dcb5fb0dbb1ab750e436a53143725354d34b178273f
 SHA512:
-  metadata.gz: d1cc13e79b76c8cef827ce7af505720845f5ad7e66c8ffd4bd07dbf4da6563e3d5450c3351ba7dd95b37c096d10b417e28bc3487fba5319d70bbe9776407b0a9
-  data.tar.gz: fab5dc5990fb886dda12232efebcdeed0701bddb4e7b605514a07a955149b34b41bde32f7b18b99aa9274e6ced874733ceddbd72c58302dad0781aeacf2f955f
+  metadata.gz: 856163f3d41918753ec4426904c20619fc46c12bbc1303e1332173c399566c17d8f1e652dd3d5cb3a1e97347e2b6158bab6f97a09a322ffc45483e0dd8b307a6
+  data.tar.gz: 443e9c168b7e9af22d5870ea63b5b084f1563ac58897d12a99893e9f8f855f4e51466376eb11ea74c920f46729c8ceb56dadfb2662aa9b7675c836a62df1cd41

data/.travis.yml

@@ -1,9 +1,18 @@
 language: ruby
 sudo: false
+branches:
+  only:
+  - master
+  - /.*-stable$/
+  - /^test-.*/
+  - /maintenance|support/
+  - /.*dev$/
 bundler_args: --without development
 script: bundle exec rake ${TEST_PREFIX}test_$DB
 before_install:
   - unset _JAVA_OPTIONS
+  - rvm @default,@global do gem uninstall bundler -a -x -I || true
+  - gem install bundler -v "~>1.17.3"
 before_script:
   - echo "JAVA_OPTS=$JAVA_OPTS"
   - export JRUBY_OPTS="-J-Xms64M -J-Xmx1024M"
@@ -45,19 +54,29 @@ env:
   - DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
   - DB=sqlite3 PREPARED_STATEMENTS=false
   - DB=sqlite3 PREPARED_STATEMENTS=true
-  #- DB=jndi PREPARED_STATEMENTS=false
-  #- DB=jndi PREPARED_STATEMENTS=true
-branches:
-  only:
-    - master
-    - /.*-stable$/
-    - /^test-.*/
-    - /maintenance|support/
-    - /.*dev$/
+  - DB=jndi PREPARED_STATEMENTS=false
+  - DB=jndi PREPARED_STATEMENTS=true
 matrix:
   allow_failures:
     - rvm: jruby-head
   include:
+    # jruby-9.2
+    - rvm: jruby-9.2.6.0
+      env: DB=mysql2
+    - rvm: jruby-9.2.6.0
+      env: DB=postgresql
+    - rvm: jruby-9.2.6.0
+      env: DB=sqlite3
+    # jruby-9.2 + Java 11
+    - rvm: jruby-9.2.6.0
+      env: DB=mysql2
+      jdk: openjdk11
+    - rvm: jruby-9.2.6.0
+      env: DB=postgresql
+      jdk: openjdk11
+    - rvm: jruby-9.2.6.0
+      env: DB=sqlite3
+      jdk: openjdk11
     # jruby-head
     - rvm: jruby-head
       env: DB=mysql2
@@ -73,9 +92,9 @@ matrix:
         mariadb: '10.1'
       env: DB=mariadb PREPARED_STATEMENTS=true
     # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.0" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.0" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.0" DRIVER=MariaDB
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.0" # PS on by default
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.0" PREPARED_STATEMENTS=false
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.2.0"
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" DRIVER=MariaDB
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS on by default
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=false
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.2.3"

data/Gemfile

@@ -52,8 +52,7 @@ end
 
 group :rails do
   group :test do
-    # FIX: Our test suite isn't ready to run in random order yet.
-    gem 'minitest', '< 5.3.4', require: nil
+    gem 'minitest', '~> 5.11.3', require: nil
     gem 'minitest-excludes', '~> 2.0.1', require: nil
     gem 'minitest-rg', require: nil
 

data/README.md

@@ -15,9 +15,16 @@ we currently have.
 For Oracle database users you are encouraged to use
 https://github.com/rsim/oracle-enhanced.
 
-Version **50.x** supports Rails version 5.0.x and it lives on branch 50-stable.
-Version **51.x** supports Rails version 5.1.x and is currently on master until
-its first release. The minimum version of JRuby for 50+ is JRuby **9.1.x** and
+Versions are targeted at certain versions of Rails and live on their own branches.
+
+| Gem Version | Rails Version | Branch |
+| ----------- | ------------- | ------ |
+| 50.x        | 5.0.x         | 50-stable |
+| 51.x        | 5.1.x         | 51-stable |
+| 52.x        | 5.2.x         | 52-stable |
+| future      | latest        | master    |
+
+The minimum version of JRuby for 50+ is JRuby **9.1.x** and
 JRuby 9.1+ requires Java 7 or newer (we recommend Java 8 at minimum).
 
 ## Using ActiveRecord JDBC

data/lib/arjdbc/abstract/core.rb

@@ -22,7 +22,7 @@ module ArJdbc
 
         connection.configure_connection # will call us (maybe)
       end
-      
+
       # Retrieve the raw `java.sql.Connection` object.
       # The unwrap parameter is useful if an attempt to unwrap a pooled (JNDI)
       # connection should be made - to really return the 'native' JDBC object.
@@ -73,4 +73,14 @@ module ArJdbc
       end
     end
   end
-end
+
+  module LogSubscriber
+    JDBC_GEM_ROOT = File.expand_path("../../../..", __FILE__) + "/"
+
+    # Remove this gem from log trace so that query shows where it was called in application
+    def ignored_callstack(path)
+      super || path.start_with?(JDBC_GEM_ROOT)
+    end
+  end
+  ActiveRecord::LogSubscriber.prepend(ArJdbc::LogSubscriber)
+end

data/lib/arjdbc/abstract/database_statements.rb

@@ -26,7 +26,7 @@ module ArJdbc
           log(sql, name) { @connection.execute_query(sql) }
         else
           log(sql, name, binds) do
-            # It seems that #supports_statement_cache? is defined but isn't checked before setting "prepare" (AR 5.0)
+            # this is different from normal AR that always caches
             cached_statement = fetch_cached_statement(sql) if prepare && @jdbc_statement_cache_enabled
             @connection.execute_prepared_query(sql, binds, cached_statement)
           end

data/lib/arjdbc/abstract/statement_cache.rb

@@ -23,7 +23,7 @@ module ArJdbc
         # Only say we support the statement cache if we are using prepared statements
         # and have a max number of statements defined
         statement_limit = self.class.type_cast_config_to_integer(config[:statement_limit])
-        @jdbc_statement_cache_enabled = config[:prepared_statements] && (statement_limit.nil? || statement_limit > 0)
+        @jdbc_statement_cache_enabled = prepared_statements && (statement_limit.nil? || statement_limit > 0)
 
         @statements = StatementPool.new(statement_limit) # AR (5.0) expects this to be stored as @statements
       end
@@ -34,11 +34,11 @@ module ArJdbc
       end
 
       def delete_cached_statement(sql)
-        @statements.delete(cached_statement_key(sql))
+        @statements.delete(sql_key(sql))
       end
 
       def fetch_cached_statement(sql)
-        @statements[cached_statement_key(sql)] ||= @connection.connection.prepare_statement(sql)
+        @statements[sql_key(sql)] ||= @connection.prepare_statement(sql)
       end
 
       def supports_statement_cache?
@@ -50,7 +50,7 @@ module ArJdbc
 
       # This should be overridden by the adapter if the sql itself
       # is not enough to make the key unique
-      def cached_statement_key(sql)
+      def sql_key(sql)
         sql
       end
 

data/lib/arjdbc/db2/adapter.rb

@@ -30,6 +30,65 @@ module ArJdbc
   # @note This adapter doesn't support explain `config.active_record.auto_explain_threshold_in_seconds` should be commented (Rails < 4.0)
   module DB2
 
+
+    module ActiveRecord::ConnectionAdapters
+
+      remove_const(:DB2Adapter) if const_defined?(:DB2Adapter)
+
+      class DB2Adapter < JdbcAdapter
+
+        include ArJdbc::DB2
+        include ArJdbc::DB2::Column
+
+        # AR 5.2 Fix
+        def initialize(connection, logger = nil, connection_parameters = nil, config = {})
+          super(connection, logger, config) # configure_connection happens in super
+        end
+
+        def jdbc_connection_class(spec)
+          ArJdbc::DB2.jdbc_connection_class
+        end
+
+        def data_source_sql(name = nil, type: nil)
+          scope = quoted_scope(name, type: type)
+
+          sql = if scope[:type] == "'T'"
+                  "select table_name from sysibm.tables".dup
+                else
+                  "select table_name from sysibm.views".dup
+                end
+
+          wheres = []
+
+          wheres << " table_type = #{scope[:type]}" if scope[:type]
+          wheres << " table_schema = #{scope[:schema]}" if scope[:schema]
+          wheres << " UPPER(table_name) = UPPER(#{scope[:name]})" if scope[:name]
+
+          if wheres.present?
+            sql << ' WHERE '
+            sql << wheres.join(' AND ')
+          end
+          sql
+        end
+
+        def quoted_scope(name = nil, type: nil)
+          type = \
+              case type
+              when "BASE TABLE"
+                "'T'"
+              when "VIEW"
+                "'V'"
+              end
+          scope = {}
+          scope[:name] = quote(name) if name
+          scope[:type] = type if type
+          scope[:schema] = quote(scope[:schema] || schema)
+          scope
+        end
+
+      end
+    end
+
     # @private
     def self.extended(adapter); initialize!; end
 
@@ -342,60 +401,10 @@ module ArJdbc
 
     # Properly quotes the various data types.
     # @param value contains the data
-    # @param column (optional) contains info on the field
     # @override
-    def quote(value, column = nil)
-      return value.quoted_id if value.respond_to?(:quoted_id)
+    def quote(value)
       return value if sql_literal?(value)
-
-      if column
-        if column.respond_to?(:primary) && column.primary && column.klass != String
-          return value.to_i.to_s
-        end
-        if value && (column.type.to_sym == :decimal || column.type.to_sym == :integer)
-          return value.to_s
-        end
-      end
-
-      column_type = column && column.type.to_sym
-
-      case value
-      when nil then 'NULL'
-      when Numeric # IBM_DB doesn't accept quotes on numeric types
-        # if the column type is text or string, return the quote value
-        if column_type == :text || column_type == :string
-          "'#{value}'"
-        else
-          value.to_s
-        end
-      when String, ActiveSupport::Multibyte::Chars
-        if column_type == :binary && column.sql_type !~ /for bit data/i
-          if update_lob_value?(value, column)
-            value.nil? ? 'NULL' : BLOB_VALUE_MARKER # '@@@IBMBINARY@@@'"
-          else
-            "BLOB('#{quote_string(value)}')"
-          end
-        elsif column && column.sql_type =~ /clob/ # :text
-          if update_lob_value?(value, column)
-            value.nil? ? 'NULL' : CLOB_VALUE_MARKER # "'@@@IBMTEXT@@@'"
-          else
-            "'#{quote_string(value)}'"
-          end
-        elsif column_type == :xml
-          value.nil? ? 'NULL' : "'#{quote_string(value)}'" # "'<ibm>@@@IBMXML@@@</ibm>'"
-        else
-          "'#{quote_string(value)}'"
-        end
-      when Symbol then "'#{quote_string(value.to_s)}'"
-      when Time
-        # AS400 doesn't support date in time column
-        if column_type == :time
-          quote_time(value)
-        else
-          super
-        end
-      else super
-      end
+      super
     end
 
     # @override
@@ -428,9 +437,9 @@ module ArJdbc
       types
     end
 
-    def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+    def type_to_sql(type, limit: nil, precision: nil, scale: nil, **)
       limit = nil if type.to_sym == :integer
-      super(type, limit, precision, scale)
+      super
     end
 
     # @private
@@ -443,7 +452,7 @@ module ArJdbc
 
     def add_column(table_name, column_name, type, options = {})
       # The keyword COLUMN allows to use reserved names for columns (ex: date)
-      add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+      add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options)}"
       add_column_options!(add_column_sql, options)
       execute(add_column_sql)
     end
@@ -586,7 +595,7 @@ module ArJdbc
     end
 
     def change_column(table_name, column_name, type, options = {})
-      data_type = type_to_sql(type, options[:limit], options[:precision], options[:scale])
+      data_type = type_to_sql(type, options)
       sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DATA TYPE #{data_type}"
       execute_table_change(sql, table_name, 'Change Column')
 
@@ -694,11 +703,10 @@ module ArJdbc
 
     # alias_method :execute_and_auto_confirm, :execute
 
-    # Returns the value of an identity column of the last *INSERT* statement
-    # made over this connection.
+    # 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 [Fixnum]
-    def last_insert_id
+    # @return [Integer, NilClass]
+    def last_inserted_id(result)
       @connection.identity_val_local
     end
 

data/lib/arjdbc/db2/as400.rb

@@ -4,6 +4,18 @@ module ArJdbc
   module AS400
     include DB2
 
+    module ActiveRecord::ConnectionAdapters
+      remove_const(:AS400Adapter) if const_defined?(:AS400Adapter)
+      class AS400Adapter < DB2Adapter
+
+        include ::ArJdbc::AS400
+
+        def jdbc_connection_class(spec)
+          ArJdbc::AS400.jdbc_connection_class
+        end
+      end
+    end
+
     # @private
     def self.extended(adapter); DB2.extended(adapter); end
 

data/lib/arjdbc/db2/column.rb

@@ -47,6 +47,9 @@ module ArJdbc
 
       # @override
       def type_cast(value)
+        # AR5.2
+        return super unless respond_to?(:type)
+
         return nil if value.nil? || value == 'NULL' || value =~ /^\s*NULL\s*$/i
         case type
         when :string    then value

data/lib/arjdbc/db2/connection_methods.rb

@@ -15,6 +15,8 @@ ArJdbc::ConnectionMethods.module_eval do
     end
     config[:driver] ||= ::ArJdbc::DB2::DRIVER_NAME
     config[:connection_alive_sql] ||= 'SELECT 1 FROM syscat.tables FETCH FIRST 1 ROWS ONLY'
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::DB2Adapter unless config.key?(:adapter_class)
+
     jdbc_connection(config)
   end
   alias_method :jdbcdb2_connection, :db2_connection
@@ -38,6 +40,8 @@ ArJdbc::ConnectionMethods.module_eval do
     require 'arjdbc/db2/as400'
     config[:driver] ||= ::ArJdbc::AS400::DRIVER_NAME
     config[:connection_alive_sql] ||= 'SELECT 1 FROM sysibm.tables FETCH FIRST 1 ROWS ONLY'
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::AS400Adapter unless config.key?(:adapter_class)
+
     jdbc_connection(config)
   end
   alias_method :jdbcas400_connection, :as400_connection

data/lib/arjdbc/jdbc.rb

@@ -9,6 +9,9 @@ module ArJdbc
   # @private
   AR50 = ::ActiveRecord::VERSION::MAJOR > 4
 
+  # @private
+  AR52 = ::ActiveRecord::VERSION::STRING >= '5.2'
+
   class << self
 
     # @private Internal API

data/lib/arjdbc/jdbc/adapter.rb

@@ -250,12 +250,6 @@ module ActiveRecord
         end
       end
 
-      # @private
-      # @override
-      def select_rows(sql, name = nil, binds = [])
-        exec_query_raw(sql, name, binds).map!(&:values)
-      end
-
       # Executes the SQL statement in the context of this connection.
       # The return value from this method depends on the SQL type (whether
       # it's a SELECT, INSERT etc.). For INSERTs a generated id might get

data/lib/arjdbc/jdbc/column.rb

@@ -26,7 +26,9 @@ module ActiveRecord
           end
         end
 
-        if ArJdbc::AR50
+        if ArJdbc::AR52
+          # undefined method `cast' for #<ActiveRecord::ConnectionAdapters::SqlTypeMetadata> on AR52
+        elsif ArJdbc::AR50
           default = args[0].cast(default)
 
           sql_type = args.delete_at(1)
@@ -42,7 +44,7 @@ module ActiveRecord
         # 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