activerecord-jdbc-adapter 1.3.21 → 1.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a16ed1301784e24f2d1d4505a56c1d54768fa0e
-  data.tar.gz: 344788fd381bc29715fd7abe72141f5da22a451e
+  metadata.gz: f59b963d6b856bb7a8ecd3ab0bf506653c04fc50
+  data.tar.gz: ff0251deca4b0c4dc691cabad8da7a6e63e3a6cd
 SHA512:
-  metadata.gz: 5898cba58332cb2e422a6e99543eae59a8e15ce1e5e92b82f2c2f56584f26c0f79a9e5600e43267d8f395d2a29086fec2253d9c003a4bf491e4c5f2914df932c
-  data.tar.gz: 6b39e4a58254f45f2c66814f844d2f922f4f5a708bb942147b53b59ac61f772344657c6146897be3943733a18dde736fe4dbde9d32e39aeb52d848e44d02c197
+  metadata.gz: 68dad2a1551b5c8fe023a0118a68786172a9df1e209261b8b66c47da4bcee33198d8a5640171ce0b9998a021164f0cbcc787e91e0ef9a5f11d3902b113de7153
+  data.tar.gz: 79d7ea6b89a613c149579e14fb065dee1e24ab93a0dae03513b3a56251edcd1c243f36b245c19de9440c87c69b830ec73336cd9cf1a43dc1651322effac8115a

data/.travis.yml

@@ -88,64 +88,64 @@ matrix:
       env: DB=mariadb PREPARED_STATEMENTS=true
       jdk: oraclejdk8
       # include some tests on JDK 6 :
-    - rvm: jruby-1.7.24
+    - rvm: jruby-1.7.26
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: openjdk6
-    - rvm: jruby-1.7.24
+    - rvm: jruby-1.7.26
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
       jdk: openjdk6
-    - rvm: jruby-1.7.24
+    - rvm: jruby-1.7.26
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: openjdk6
-    - rvm: jruby-1.7.24
+    - rvm: jruby-1.7.26
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: openjdk6
-    - rvm: jruby-1.7.24
+    - rvm: jruby-1.7.26
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
       jdk: openjdk6
-    - rvm: jruby-1.7.24
+    - rvm: jruby-1.7.26
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: openjdk6
       # include testing with JRuby 9K (4.2) :
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=true
       jdk: oraclejdk7
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
       jdk: oraclejdk7
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk7
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: oraclejdk8
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
       jdk: oraclejdk8
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: oraclejdk8
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
       jdk: oraclejdk8
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.6.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: oraclejdk8

data/History.md

@@ -1,3 +1,22 @@
+## 1.3.22 (12/23/16)
+
+- [postgres] Fix incorrect postgresql_version when running RC (#717)
+- [postgres] fixed insert into partitioned table (#723)
+- [postgres] add ssl support from environment vars (#760)
+- [postgres] Adds citext to AR42 Native database types (#746)
+- [mysql] handle db:create failure compatibly with AR's MySQL tasks
+- [mssql] Changed selects from information schema to uppercase
+  in case SQLServer database has case sensitive collation
+- Added long varchar to type converter for legacy sybase DB (#757)
+- [mysql] Don't read mysql binary column as stream (#742)
+
+## 1.3.21 (08/18/16)
+
+- check for instanceof RubyArray when extracting binds with stmnts
+  (for JRuby 9.1 packed array feature compatibility)
+- default to useSSL=false for MariaDB driver
+- [db2] allow to force zos: true using database config
+
 ## 1.3.20 (03/09/16)
 
 - Retrieve AM::Type::Boolean::FALSE_VALUES for Rails 5 (#705)

data/lib/arjdbc/jdbc/type_converter.rb

@@ -34,6 +34,7 @@ module ActiveRecord
         :text        => [ lambda {|r| TEXT_TYPES.include?(r['data_type'].to_i)},
                           lambda {|r| r['type_name'] =~ /^text$/i},     # For Informix
                           lambda {|r| r['type_name'] =~ /sub_type 1$/i}, # For FireBird
+                          lambda {|r| r['type_name'] =~ /^long varchar$/i}, # Legacy Sybase/SqlAnywhere
                           lambda {|r| r['type_name'] =~ /^(text|clob)$/i},
                           lambda {|r| r['type_name'] =~ /^character large object$/i},
                           lambda {|r| r['sql_data_type'] == 2005}],

data/lib/arjdbc/mssql/adapter.rb

@@ -574,7 +574,7 @@ module ArJdbc
     def remove_check_constraints(table_name, column_name)
       clear_cached_table(table_name)
       constraints = select_values "SELECT constraint_name" <<
-        " FROM information_schema.constraint_column_usage" <<
+        " FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE" <<
         " WHERE table_name = '#{table_name}' AND column_name = '#{column_name}'"
       constraints.each do |constraint_name|
         execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}"

data/lib/arjdbc/postgresql/adapter.rb

@@ -67,7 +67,7 @@ module ArJdbc
       @postgresql_version ||=
         begin
           version = select_version
-          if version =~ /PostgreSQL (\d+)\.(\d+)\.(\d+)/
+          if version =~ /PostgreSQL (\d+)\.(\d+)(?:\.(\d+))?/
             ($1.to_i * 10000) + ($2.to_i * 100) + $3.to_i
           else
             0
@@ -286,7 +286,8 @@ module ArJdbc
       :bigserial => "bigserial",
       :bigint => { :name => "bigint" },
       :bit => { :name => "bit" },
-      :bit_varying => { :name => "bit varying" }
+      :bit_varying => { :name => "bit varying" },
+      :citext => { :name => "citext" }
     ) if AR42
 
     def native_database_types
@@ -686,7 +687,8 @@ module ArJdbc
       return result if result.is_a? Integer
       # <ActiveRecord::Result @hash_rows=nil, @columns=["id"], @rows=[[3]]>
       # but it will work with [{ 'id' => 1 }] Hash wrapped results as well
-      result.first.first[1] # .first = { "id"=>1 } .first = [ "id", 1 ]
+      row = result.first
+      row && row.first[1] # .first = { "id"=>1 } .first = [ "id", 1 ]
     end
 
     def last_insert_id(table, sequence_name = nil)

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -31,13 +31,16 @@ ArJdbc::ConnectionMethods.module_eval do
     end
     sslmode = config.key?(:sslmode) ? config[:sslmode] : config[:requiressl]
     # NOTE: makes not much sense since this needs some JVM options :
-    # sslmode = ENV['PGSSLMODE'] || ENV['PGREQUIRESSL'] if sslmode.nil?
+    sslmode = ENV['PGSSLMODE'] || ENV['PGREQUIRESSL'] if sslmode.nil?
     unless sslmode.nil? # PG :sslmode - disable|allow|prefer|require
       # JRuby/JVM needs to be started with :
       #  -Djavax.net.ssl.trustStore=mystore -Djavax.net.ssl.trustStorePassword=...
       # or a non-validating connection might be used (for testing) :
       #  :sslfactory = 'org.postgresql.ssl.NonValidatingFactory'
-      properties['ssl'] ||= 'true' if sslmode == true || sslmode.to_s == 'require'
+      if sslmode == true || sslmode.to_s == 'require'
+        properties['sslfactory'] ||= 'org.postgresql.ssl.NonValidatingFactory' 
+        properties['ssl'] ||= 'true' 
+      end
     end
     properties['tcpKeepAlive'] ||= config[:keepalives] if config.key?(:keepalives)
     properties['kerberosServerName'] ||= config[:krbsrvname] if config[:krbsrvname]

data/lib/arjdbc/tasks/databases4.rake

@@ -1,7 +1,7 @@
 module ActiveRecord::Tasks
 
   DatabaseTasks.module_eval do
-    
+
     # patched to adapt jdbc configuration
     def each_current_configuration(environment)
       environments = [environment]
@@ -31,9 +31,14 @@ module ActiveRecord::Tasks
   MySQLDatabaseTasks.class_eval do
 
     def error_class
-      ActiveRecord::JDBCError
+      @_error_class ||= begin
+        unless ActiveRecord::JDBCError.instance_methods.include?(:error)
+          ActiveRecord::JDBCError.send :alias_method, :error, :sql_exception
+        end
+        ActiveRecord::JDBCError
+      end
     end
 
   end
-  
+
 end

data/lib/arjdbc/version.rb

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

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -54,6 +54,7 @@ import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 
 /**
  *
@@ -102,6 +103,12 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             final int value = resultSet.getInt(column);
             return resultSet.wasNull() ? runtime.getNil() : runtime.newFixnum(value);
         }
+        else if ( type == Types.BINARY || type == Types.VARBINARY) {
+            final byte[] bytes = resultSet.getBytes(column);
+            if ( bytes == null || resultSet.wasNull() ) return runtime.getNil();
+            final ByteList byteList = new ByteList(bytes, false);
+            return new RubyString(runtime, runtime.getString(), byteList);
+        }
         return super.jdbcToRuby(context, runtime, column, type, resultSet);
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.21
+  version: 1.3.22
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement