activerecord-jdbc-adapter 1.3.20 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82589d846e5ee11d8bd85ffb825c8b58571ef837
-  data.tar.gz: 9bda0dc210283b928b1c97a8b66e72b17348635c
+  metadata.gz: 9a16ed1301784e24f2d1d4505a56c1d54768fa0e
+  data.tar.gz: 344788fd381bc29715fd7abe72141f5da22a451e
 SHA512:
-  metadata.gz: 914c271374806217b3e5396036d5e147c7dd56f6fc06515c121715e9abce9a4b91dd70daf91423029d35380d43d20938fd6d75aa9c8295079a0844e93e32202b
-  data.tar.gz: 511b7f9fe9adbc153cf2d1fca7992f63341db16097abeba55563b465e81634429460d35e1118864098e53459192ad07e5fd3c3121c61c6e5f24b7e21a3c00711
+  metadata.gz: 5898cba58332cb2e422a6e99543eae59a8e15ce1e5e92b82f2c2f56584f26c0f79a9e5600e43267d8f395d2a29086fec2253d9c003a4bf491e4c5f2914df932c
+  data.tar.gz: 6b39e4a58254f45f2c66814f844d2f922f4f5a708bb942147b53b59ac61f772344657c6146897be3943733a18dde736fe4dbde9d32e39aeb52d848e44d02c197

data/.travis.yml

@@ -65,6 +65,8 @@ matrix:
     - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
+    - env: DB=mariadb
+    - env: DB=mariadb PREPARED_STATEMENTS=true
   include:
     # testing against MariaDB
     - addons:
@@ -76,14 +78,14 @@ matrix:
     - addons:
         mariadb: '10.0'
       rvm: jruby-1.7.24
-      gemfile: gemfiles/rails40.gemfile
-      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb
+      gemfile: gemfiles/rails42.gemfile
+      env: DB=mariadb
       jdk: openjdk7
     - addons:
         mariadb: '10.0'
       rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
-      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb PREPARED_STATEMENTS=true
+      env: DB=mariadb PREPARED_STATEMENTS=true
       jdk: oraclejdk8
       # include some tests on JDK 6 :
     - rvm: jruby-1.7.24
@@ -111,39 +113,39 @@ matrix:
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: openjdk6
       # include testing with JRuby 9K (4.2) :
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=true
       jdk: oraclejdk7
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
       jdk: oraclejdk7
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk7
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: oraclejdk8
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
       jdk: oraclejdk8
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: oraclejdk8
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
       jdk: oraclejdk8
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: oraclejdk8

data/Gemfile

@@ -34,7 +34,7 @@ gem 'bcrypt-ruby', '~> 3.0.0', :require => nil, :group => :test
 #gem 'trinidad_dbpool', :require => nil, :group => :test
 
 group :development do
-  gem 'ruby-debug', :require => nil # if ENV['DEBUG']
+  gem 'ruby-debug', :require => nil if ENV['DEBUG']
   group :doc do
     gem 'yard', :require => nil
     gem 'yard-method-overrides', :github => 'kares/yard-method-overrides', :require => nil

data/lib/arjdbc/db2/adapter.rb

@@ -579,6 +579,7 @@ module ArJdbc
     end
 
     def change_column_null(table_name, column_name, null)
+      raise NotImplementedError, "DB2 for zOS does not support changing the column's nullability" if zos?
       if null
         sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP NOT NULL"
       else
@@ -589,6 +590,7 @@ module ArJdbc
 
     def change_column_default(table_name, column_name, default)
       if default.nil?
+        raise NotImplementedError, "DB2 for zOS does not support changing the column default to NULL" if zos?
         sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP DEFAULT"
       else
         sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET WITH DEFAULT #{quote(default)}"
@@ -691,6 +693,12 @@ module ArJdbc
     # @override
     def supports_views?; true end
 
+    # @override
+    def supports_foreign_keys?; true end
+
+	  # @override
+    def supports_ddl_transactions?; true end
+
     def execute_table_change(sql, table_name, name = nil)
       outcome = execute(sql, name)
       reorg_table(table_name, name)
@@ -737,11 +745,14 @@ module ArJdbc
 
     # @private
     def zos?
-      @zos = nil unless defined? @zos
+      @zos = config[:zos] unless defined? @zos
       return @zos unless @zos.nil?
+      # jdbc:db2: - connection to a DB2 for z/OS, DB2 for Linux, UNIX, and Windows
+      # jdbc:db2j:net: - connection is to a remote IBM Cloudscape server
+      # jdbc:ids: - informix (not supported)
       @zos =
         if url = config[:url]
-          !!( url =~ /^jdbc:db2j:net:/ && config[:driver] == DRIVER_NAME )
+          !!( config[:driver] == DRIVER_NAME && url =~ /^jdbc:db2j:net:/ )
         else
           nil
         end

data/lib/arjdbc/h2/adapter.rb

@@ -10,6 +10,11 @@ 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) } ]
@@ -300,4 +305,8 @@ module ActiveRecord::ConnectionAdapters
     include ArJdbc::H2
   end
 
+  class H2Column < JdbcColumn
+    include ::ArJdbc::H2::Column
+  end
+
 end

data/lib/arjdbc/jdbc/adapter.rb

@@ -826,13 +826,13 @@ module ActiveRecord
             false # off by default - NOTE: on AR 4.x it's on by default !?
       end
 
-      if @@suble_binds = Java::JavaLang::System.getProperty('arjdbc.adapter.suble_binds')
+      if @@suble_binds = ENV_JAVA['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
+      def self.suble_binds=(flag); @@suble_binds = flag; end # remove on 1.4
 
       private
 

data/lib/arjdbc/mysql/connection_methods.rb

@@ -63,9 +63,11 @@ ArJdbc::ConnectionMethods.module_eval do
           properties['verifyServerCertificate'] ||= false if mysql_driver
         end
       end
-      if mariadb_driver
-        properties['verifyServerCertificate'] ||= false
-      end
+      properties['verifyServerCertificate'] ||= false if mariadb_driver
+    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
     end
     if socket = config[:socket]
       properties['localSocket'] ||= socket if mariadb_driver

data/lib/arjdbc/version.rb

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

data/rakelib/db.rake

@@ -6,21 +6,23 @@ namespace :db do
   task :mysql do
     fail "could not create test database: mysql executable not found" unless mysql = which('mysql')
     load 'test/db/mysql_config.rb' # rescue nil
+    puts MYSQL_CONFIG.inspect if $VERBOSE
     script = sql_script <<-SQL, 'mysql'
 DROP DATABASE IF EXISTS `#{MYSQL_CONFIG[:database]}`;
+CREATE USER #{MYSQL_CONFIG[:username]}@localhost;
 CREATE DATABASE `#{MYSQL_CONFIG[:database]}` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_general_ci`;
 GRANT ALL PRIVILEGES ON `#{MYSQL_CONFIG[:database]}`.* TO #{MYSQL_CONFIG[:username]}@localhost;
 GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
 SET PASSWORD FOR #{MYSQL_CONFIG[:username]}@localhost = PASSWORD('#{MYSQL_CONFIG[:password]}');
 SQL
     params = { '-u' => 'root' }
-    if ENV['DATABASE_YML']
-      require 'yaml'
-      password = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
-      params['--password'] = password
+    if ENV['DATABASE_YML']; require 'yaml'
+      params['-p'] = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
     end
+    params['-u'] = ENV['MY_USER'] if ENV['MY_USER']
+    params['-p'] = ENV['MY_PASSWORD'] if ENV['MY_PASSWORD']
     puts "Creating MySQL (test) database: #{MYSQL_CONFIG[:database]}"
-    sh "cat #{script.path} | #{mysql} #{params.to_a.join(' ')}", :verbose => $VERBOSE # so password is not echoed
+    sh "cat #{script.path} | #{mysql} -f #{params.map {|k, v| "#{k}#{v}"}.join(' ')}", :verbose => $VERBOSE # so password is not echoed
   end
 
   desc "Creates the test database for PostgreSQL"
@@ -28,6 +30,7 @@ SQL
     fail 'could not create test database: psql executable not found' unless psql = which('psql')
     fail 'could not create test database: missing "postgres" role' unless PostgresHelper.postgres_role?
     load 'test/db/postgres_config.rb' # rescue nil
+    puts POSTGRES_CONFIG.inspect if $VERBOSE
     script = sql_script <<-SQL, 'psql'
 DROP DATABASE IF EXISTS #{POSTGRES_CONFIG[:database]};
 DROP USER IF EXISTS #{POSTGRES_CONFIG[:username]};

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

@@ -2146,7 +2146,7 @@ public class RubyJdbcConnection extends RubyObject {
         for ( int i = 0; i < binds.size(); i++ ) {
             // [ [ column1, param1 ], [ column2, param2 ], ... ]
             Object param = binds.get(i); IRubyObject column = null;
-            if ( param.getClass() == RubyArray.class ) {
+            if ( param instanceof RubyArray ) {
                 final RubyArray _param = (RubyArray) param;
                 column = _param.eltInternal(0); param = _param.eltInternal(1);
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.21
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -215,16 +215,13 @@ files:
 - src/java/arjdbc/jdbc/SQLBlock.java
 - src/java/arjdbc/mssql/MSSQLModule.java
 - src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java
-- src/java/arjdbc/mssql/MssqlRubyJdbcConnection.java
 - src/java/arjdbc/mysql/MySQLModule.java
 - src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java
 - src/java/arjdbc/oracle/OracleModule.java
 - src/java/arjdbc/oracle/OracleRubyJdbcConnection.java
 - src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java
-- src/java/arjdbc/postgresql/PostgresqlRubyJdbcConnection.java
 - src/java/arjdbc/sqlite3/SQLite3Module.java
 - src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java
-- src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java
 - src/java/arjdbc/util/CallResultSet.java
 - src/java/arjdbc/util/QuotingUtils.java
 homepage: https://github.com/jruby/activerecord-jdbc-adapter

data/src/java/arjdbc/mssql/MssqlRubyJdbcConnection.java

@@ -1,40 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright 2013 Karol Bucek.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package arjdbc.mssql;
-
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-
-/**
- * @see MSSQLRubyJdbcConnection
- * @deprecated only for Java API backwards-compatibility
- */
-@Deprecated
-public class MssqlRubyJdbcConnection extends MSSQLRubyJdbcConnection {
-    
-    protected MssqlRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
-        super(runtime, metaClass);
-    }
-    
-}

data/src/java/arjdbc/postgresql/PostgresqlRubyJdbcConnection.java

@@ -1,40 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright 2013 Karol Bucek.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package arjdbc.postgresql;
-
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-
-/**
- * @see PostgreSQLRubyJdbcConnection
- * @deprecated only for Java API backwards-compatibility
- */
-@Deprecated
-public class PostgresqlRubyJdbcConnection extends PostgreSQLRubyJdbcConnection {
-    
-    protected PostgresqlRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
-        super(runtime, metaClass);
-    }
-    
-}

data/src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java

@@ -1,40 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright 2013 Karol Bucek.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package arjdbc.sqlite3;
-
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-
-/**
- * @see SQLite3RubyJdbcConnection
- * @deprecated only for Java API backwards-compatibility
- */
-@Deprecated
-public class Sqlite3RubyJdbcConnection extends SQLite3RubyJdbcConnection {
-    
-    protected Sqlite3RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
-        super(runtime, metaClass);
-    }
-    
-}