activerecord-jdbc-adapter 1.3.24 → 1.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03de925ceee26187bae69a5e29fe1b3a0b23214b
-  data.tar.gz: b46c3b722e5399ce64b20cd949c07abed5170563
+  metadata.gz: 281e8f3a4a07822db0e22d4ccddcab3cfac306df
+  data.tar.gz: 6272c2231879854604d74b03720a6759f1e601ac
 SHA512:
-  metadata.gz: a4ddbaa31377d0a6168a9a2968c549018c4cdcd9db2d5320f4a1cb9e291dbf6d7cc8b6909da14e0b41e8e7da72cb04d3a7131a8cb80450debc2af6eaf8ade15e
-  data.tar.gz: faee7550a6863ec808c0024451af4632212509cbb7801f5434752790b7cf9bee037381cba269125c89dd0c80a6a860e2f72289f4b8658545db3c261a6f469310
+  metadata.gz: bb5752131090b67b4724e34ced5ce7ca04eab6b5f593e2b99d95d7b8914ec20b90a96d0e1820c09bcbea7ad145819cb3349155ef0986cf26d9943cfad080972f
+  data.tar.gz: 8a9cc04265ff89f82356d99c8418a7203269146462aae805f302aefb2b799f810421f526dc1989b96d543a365e5f964f1d9ac444890053374f6725c22f6fc905

data/.travis.yml

@@ -1,3 +1,8 @@
+addons:
+  apt:
+    packages:
+      - openjdk-6-jdk
+
 language: ruby
 sudo: false
 bundler_args: --without development
@@ -46,42 +51,44 @@ branches:
     - /^test-.*/
 matrix:
   allow_failures:
-    - env: DB=mariadb
-    - env: DB=mariadb PREPARED_STATEMENTS=true
+    # NOTE: failing HStore inserts for whatever reason - hopefully someone will investigate ...
+    - env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
+    - env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
+    - env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
   include:
     # testing against MariaDB
     - addons:
-        mariadb: '5.5'
+        mariadb: '10.0'
       rvm: jruby-1.7.24
       gemfile: gemfiles/rails32.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
-      jdk: openjdk6
+      jdk: openjdk8 # MariaDB 2.x assumes JDK 8
     - addons:
         mariadb: '10.1'
       rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: DB=mariadb
-      jdk: openjdk7
+      jdk: openjdk8
     - addons:
-        mariadb: '10.1'
+        mariadb: '10.2'
       rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: DB=mariadb PREPARED_STATEMENTS=true
       jdk: oraclejdk8
       # include some tests on JDK 6 :
-    - rvm: jruby-1.7.26
+    - rvm: jruby-1.7.27
       gemfile: gemfiles/rails42.gemfile
-      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
+      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=mysql
       jdk: openjdk6
-    - rvm: jruby-1.7.26
+    - rvm: jruby-1.7.27
       gemfile: gemfiles/rails42.gemfile
-      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
+      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=postgresql
       jdk: openjdk6
-    - rvm: jruby-1.7.26
+    - rvm: jruby-1.7.27
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: openjdk6
-    - rvm: jruby-1.7.26
+    - rvm: jruby-1.7.27
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: openjdk6
@@ -93,40 +100,61 @@ matrix:
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: openjdk6
+      # include some (more) --2.0 testing :
+    - rvm: jruby-1.7.27
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=mysql
+      jdk: openjdk8
+    - rvm: jruby-1.7.27
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=postgresql
+      jdk: openjdk7
+    - rvm: jruby-1.7.27
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=sqlite3
+      jdk: openjdk7
       # include testing with JRuby 9K (4.2) :
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=true
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.6.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.13.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql DRIVER=MariaDB PREPARED_STATEMENTS=true
+      jdk: openjdk8
+    - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.8.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.6.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: oraclejdk8
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.12.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql DRIVER=MariaDB
+      jdk: oraclejdk8
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
       jdk: oraclejdk8
-    - rvm: jruby-9.1.6.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: oraclejdk8
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
       jdk: oraclejdk8
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: oraclejdk8
@@ -143,27 +171,31 @@ matrix:
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.8.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.13.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql DRIVER=MariaDB
+      jdk: openjdk8 # MariaDB 2.x assumes JDK 8
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.8.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.8.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.8.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.13.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: oraclejdk8

data/History.md

@@ -1,3 +1,12 @@
+## 1.3.25 (08/22/18)
+
+- [mysql] get rid of official driver < 5 checking on conn initialization 
+- [oracle] fix Oracle adapter not suing schema config properly (#869) 
+- [db2] refactor db2 quote (to avoid SQL injection) (#861) 
+- [db2] Fix a TypeError that happens when offset is used without limit (#873)
+- [mssql] automatically remove identity columns from AR generated UPDATE (#872)
+- [db2] Errors when dealing with blobs in jruby 9.2k (#902)
+
 ## 1.3.24 (09/24/17)
 
 - [as400] Fixed ordering when limit and offset present (#789)

data/lib/arjdbc/db2/adapter.rb

@@ -356,62 +356,49 @@ module ArJdbc
     # @param column (optional) contains info on the field
     # @override
     def quote(value, column = nil)
-      return value.quoted_id if value.respond_to?(:quoted_id)
       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 column.respond_to?(:cast_type) && column.cast_type.is_a?(ActiveRecord::Type::Serialized)
-          return quote(column.cast_type.type_cast_for_database(value))
-        end if ::ActiveRecord::VERSION::MAJOR >= 4
-
-        if value && (column.type.to_sym == :decimal || column.type.to_sym == :integer)
-          return value.to_s
-        end
+      # Can anyone explain what this is for?
+      if column && column.respond_to?(:primary) && column.primary && column.klass != String
+        return value.to_i.to_s
       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@@@'"
+        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
-            "BLOB('#{quote_string(value)}')"
+            super
           end
-        elsif column && column.sql_type =~ /clob/ # :text
-          if update_lob_value?(value, column)
-            value.nil? ? 'NULL' : CLOB_VALUE_MARKER # "'@@@IBMTEXT@@@'"
+
+        when String, ActiveSupport::Multibyte::Chars
+          if column_type == :binary && column.sql_type !~ /for bit data/i
+            if update_lob_value?(value, column)
+              BLOB_VALUE_MARKER # '@@@IBMBINARY@@@'"
+            else
+              "BLOB('#{super}')"
+            end
+          elsif column && column.sql_type =~ /clob/ # :text
+            CLOB_VALUE_MARKER if update_lob_value?(value, column)# "'@@@IBMTEXT@@@'"
           else
-            "'#{quote_string(value)}'"
+            super
           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)
+
+        when Time
+          # AS400 doesn't support date in time column
+          if column_type == :time
+            quote_time(value)
+          else
+            super
+          end
+
         else
           super
-        end
-      else super
       end
+
     end
 
     # @override
@@ -506,9 +493,9 @@ module ArJdbc
         param_sql << " LIMIT #{limit} OFFSET #{offset} "
       else
         param_sql << " OFFSET #{offset}" if offset.present?
-        param_sql <<  if limit.present?
-                        limit == 1 ? ' FETCH FIRST ROW ONLY' : " FETCH FIRST #{limit} ROWS ONLY"
-                      end
+        if limit.present?
+          param_sql << (limit == 1 ? ' FETCH FIRST ROW ONLY' : " FETCH FIRST #{limit} ROWS ONLY")
+        end
       end
 
       if sql.is_a?(String)

data/lib/arjdbc/mssql/adapter.rb

@@ -35,6 +35,7 @@ module ArJdbc
     require 'arjdbc/mssql/column'
     require 'arjdbc/mssql/explain_support'
     require 'arjdbc/mssql/types' if AR42
+    require 'arjdbc/mssql/attributes_for_update'
 
     include LimitHelpers
     include Utils

data/lib/arjdbc/mssql/attributes_for_update.rb

@@ -0,0 +1,22 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module CoreExt
+        module AttributeMethods
+
+
+          private
+
+          def attributes_for_update(attribute_names)
+            super.reject do |name|
+              column = self.class.columns_hash[name]
+              column && column.respond_to?(:identity?) && column.identity?
+            end
+          end
+
+        end
+      end
+    end
+  end
+end
+ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::AttributeMethods

data/lib/arjdbc/mysql/adapter.rb

@@ -28,12 +28,7 @@ module ArJdbc
     # @private
     def init_connection(jdbc_connection)
       meta = jdbc_connection.meta_data
-      if meta.driver_major_version == 1 # TODO check in driver code
-        # assumes MariaDB 1.x currently
-      elsif meta.driver_major_version < 5
-        raise ::ActiveRecord::ConnectionNotEstablished,
-          "MySQL adapter requires driver >= 5.0 got: '#{meta.driver_version}'"
-      elsif meta.driver_major_version == 5 && meta.driver_minor_version < 1
+      if meta.driver_major_version == 5 && meta.driver_minor_version < 1
         config[:connection_alive_sql] ||= 'SELECT 1' # need 5.1 for JDBC 4.0
       else
         # NOTE: since the loaded Java driver class can't change :

data/lib/arjdbc/mysql/connection_methods.rb

@@ -67,7 +67,7 @@ ArJdbc::ConnectionMethods.module_eval do
     else
       # According to MySQL 5.5.45+, 5.6.26+ and 5.7.6+ requirements SSL connection
       # must be established by default if explicit option isn't set :
-      properties['useSSL'] ||= false
+      properties[mariadb_driver ? 'useSsl' : 'useSSL'] ||= false
     end
     if socket = config[:socket]
       properties['localSocket'] ||= socket if mariadb_driver

data/lib/arjdbc/oracle/adapter.rb

@@ -921,9 +921,13 @@ module ArJdbc
     # default schema owner
     def schema_owner(force = true)
       unless defined? @schema_owner
-        username = config[:username] ? config[:username].to_s : nil
-        username = jdbc_connection.meta_data.user_name if force && username.nil?
-        @schema_owner = username.nil? ? nil : username.upcase
+        if !config[:schema].nil?
+          @schema_owner = config[:schema].upcase
+        else
+          username = config[:username] ? config[:username].to_s : nil
+          username = jdbc_connection.meta_data.user_name if force && username.nil?
+          @schema_owner = username.nil? ? nil : username.upcase
+        end
       end
       @schema_owner
     end

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.24"
+  VERSION = "1.3.25"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -1473,8 +1473,8 @@ public class RubyJdbcConnection extends RubyObject {
         final IRubyObject record, final IRubyObject column, final IRubyObject value)
         throws SQLException {
 
-        final boolean binary = // column.type == :binary
-            column.callMethod(context, "type").toString() == (Object) "binary";
+        // column.type == :binary
+        final boolean binary = column.callMethod(context, "type").toString().equals("binary");
 
         final IRubyObject recordClass = record.callMethod(context, "class");
         final IRubyObject adapter = recordClass.callMethod(context, "connection");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.24
+  version: 1.3.25
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - lib/arjdbc/mimer/adapter.rb
 - lib/arjdbc/mssql.rb
 - lib/arjdbc/mssql/adapter.rb
+- lib/arjdbc/mssql/attributes_for_update.rb
 - lib/arjdbc/mssql/column.rb
 - lib/arjdbc/mssql/connection_methods.rb
 - lib/arjdbc/mssql/explain_support.rb