activerecord-jdbc-adapter 1.3.18 → 1.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86270ab993887f84a2f2bb4dbbb8826b95c23ca8
-  data.tar.gz: 7af7d89826ae8b430395bedbf64af8aeab0a3cfc
+  metadata.gz: 19e56fe06c05f03b099bb62c6d6cad31e533d206
+  data.tar.gz: b48a142b0ed768d61928d393f66f5f23ef104237
 SHA512:
-  metadata.gz: e2c2d95d0620b913bea2f02c5448bb709ed5e6e7033434ca367c011f0d6b6dc55d4b4862f6011fa0371fa9ae88d2396af143fe8b202da2f8ea10fe833c4dcc61
-  data.tar.gz: 87d7ffe54e5fe6e44871e85f16af7db741c1fec6cbd37b82dfb235d59cb0ad7f24af9f6074f7368bb613320f4fdfbcb017fa17f23337ba761b11f95dcfe5d112
+  metadata.gz: f3f2e725dcbaf68da28f4a4dbec5815d350132d8383980adc608a2b269f6a55e2efc90e42169178c432b98d22063abcdd602159b46cf17bb663f3adeb186ad04
+  data.tar.gz: b1c911e93edfcc4f25c9ac0e091541fa0834f1e6b731c0bbcc57e5df6b06014a3b83fb87c11b241a36f9697b6f02a22fa0c709c57eba5d3b350525447325dc4c

data/Appraisals

@@ -12,6 +12,7 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
+  gem 'i18n', '< 0.7'
   gem "activerecord", "~> 3.2.19", :require => false
 end
 

data/Gemfile

@@ -52,7 +52,7 @@ if sqlite_version = ENV['JDBC_SQLITE_VERSION'] # for testing against different v
   gem 'jdbc-sqlite3', sqlite_version, :require => nil, :platform => :jruby, :group => :test
 end
 
-gem 'mysql2', :require => nil, :platform => :mri, :group => :test
+gem 'mysql2', '< 0.4', :require => nil, :platform => :mri, :group => :test
 gem 'pg', :require => nil, :platform => :mri, :group => :test
 gem 'sqlite3', :require => nil, :platform => :mri, :group => :test
 group :mssql do

data/History.md

@@ -1,3 +1,14 @@
+## 1.3.19 (11/02/15)
+
+- [sqlite] add supports_partial_index? and remove duplicate support_index_sort_order?
+- [sqlite] fix missing save-point removal in release_savepoint
+- test and fix current savepoint_name compatibility with AR versions (mostly 4.2)
+  * adjust returned current savepoint name to better match with AR (< 4.2)
+  * make sure savepoint rollback behave AR compatibly
+- [mysql] revert to extracting BIT into an int as tinyint(1) (#687)
+- [mysql] do not validate connection_alive_sql as there's a special /* ping */ query
+- support timeouts on connection validation with `config[:connection_alive_timeout]`
+
 ## 1.3.18 (09/14/15)
 
 - since arel visitor instances might get re-used we need to avoid the @instance

data/lib/arjdbc/jdbc/adapter.rb

@@ -396,7 +396,7 @@ module ActiveRecord
       # @param name the save-point name
       # @since 1.3.0
       # @extension added optional name parameter
-      def rollback_to_savepoint(name = current_savepoint_name)
+      def rollback_to_savepoint(name = current_savepoint_name(true))
         @connection.rollback_savepoint(name)
       end
 
@@ -406,7 +406,7 @@ module ActiveRecord
       # @param name the save-point name
       # @since 1.3.0
       # @extension added optional name parameter
-      def release_savepoint(name = current_savepoint_name)
+      def release_savepoint(name = current_savepoint_name(false))
         @connection.release_savepoint(name)
       end
 
@@ -417,17 +417,20 @@ module ActiveRecord
       # @return [String] the current save-point name
       # @since 1.3.0
       # @override
-      def current_savepoint_name(create = nil)
+      def current_savepoint_name(compat = true)
         open_tx = open_transactions
-        return "active_record_#{open_tx}" if create
+        return "active_record_#{open_tx}" if compat # by default behave like AR
 
         sp_names = @connection.marked_savepoint_names
-        unless sp_names.empty?
-          sp_names[ -(sp_names.size - open_tx + 1) ]
-        else
-          "active_record_#{open_tx}"
-        end
-      end
+        sp_names.last || "active_record_#{open_tx}"
+        # should (open_tx- 1) here but we play by AR's rules as it might fail
+      end unless ArJdbc::AR42
+
+      # @note Same as AR 4.2 but we're allowing an unused parameter.
+      # @private
+      def current_savepoint_name(compat = nil)
+        current_transaction.savepoint_name # unlike AR 3.2-4.1 might be nil
+      end if ArJdbc::AR42
 
       # @override
       def supports_views?

data/lib/arjdbc/mssql/adapter.rb

@@ -717,7 +717,7 @@ module ArJdbc
     end
 
     # @override
-    def release_savepoint(name = current_savepoint_name)
+    def release_savepoint(name = current_savepoint_name(false))
       if @connection.jtds_driver?
         @connection.release_savepoint(name)
       else # MS invented it's "own" way

data/lib/arjdbc/mysql/adapter.rb

@@ -286,7 +286,7 @@ module ArJdbc
       version[0] && version[0] >= 5 # MySQL 5+
     end
 
-    # NOTE: handled by JdbcAdapter we override only to have save-point in logs :
+    # NOTE: handled by JdbcAdapter only to have statements in logs :
 
     # @override
     def supports_savepoints?
@@ -299,12 +299,12 @@ module ArJdbc
     end
 
     # @override
-    def rollback_to_savepoint(name = current_savepoint_name)
+    def rollback_to_savepoint(name = current_savepoint_name(true))
       log("ROLLBACK TO SAVEPOINT #{name}", 'Savepoint') { super }
     end
 
     # @override
-    def release_savepoint(name = current_savepoint_name)
+    def release_savepoint(name = current_savepoint_name(false))
       log("RELEASE SAVEPOINT #{name}", 'Savepoint') { super }
     end
 

data/lib/arjdbc/mysql/explain_support.rb

@@ -44,7 +44,7 @@ module ArJdbc
           pp << separator
           pp << build_footer(result.rows.length, elapsed)
 
-          pp.join("\n") + "\n"
+          pp.join(sep = "\n") << sep
         end
 
         private
@@ -59,8 +59,7 @@ module ArJdbc
         end
 
         def build_separator(widths)
-          padding = 1
-          '+' + widths.map {|w| '-' * (w + (padding*2))}.join('+') + '+'
+          padding = 1; "+#{widths.map { |w| '-' * (w + (padding * 2 )) }.join('+')}+"
         end
 
         def build_cells(items, widths)
@@ -70,7 +69,7 @@ module ArJdbc
             justifier = item.is_a?(Numeric) ? 'rjust' : 'ljust'
             cells << item.to_s.send(justifier, widths[i])
           end
-          '| ' + cells.join(' | ') + ' |'
+          "|#{cells.join(' | ')}|"
         end
 
         def build_footer(nrows, elapsed)

data/lib/arjdbc/postgresql/adapter.rb

@@ -397,12 +397,12 @@ module ArJdbc
     end
 
     # @override
-    def rollback_to_savepoint(name = current_savepoint_name)
+    def rollback_to_savepoint(name = current_savepoint_name(true))
       log("ROLLBACK TO SAVEPOINT #{name}", 'Savepoint') { super }
     end
 
     # @override
-    def release_savepoint(name = current_savepoint_name)
+    def release_savepoint(name = current_savepoint_name(false))
       log("RELEASE SAVEPOINT #{name}", 'Savepoint') { super }
     end
 

data/lib/arjdbc/sqlite3/adapter.rb

@@ -155,22 +155,22 @@ module ArJdbc
     end
 
     # @override
-    def supports_add_column?
-      true
+    def supports_partial_index?
+      sqlite_version >= '3.8.0'
     end
 
     # @override
-    def supports_count_distinct?
+    def supports_add_column?
       true
     end
 
     # @override
-    def supports_autoincrement?
+    def supports_count_distinct?
       true
     end
 
     # @override
-    def supports_index_sort_order?
+    def supports_autoincrement?
       true
     end
 
@@ -285,12 +285,12 @@ module ArJdbc
     end
 
     # @override
-    def rollback_to_savepoint(name = current_savepoint_name)
+    def rollback_to_savepoint(name = current_savepoint_name(true))
       log("ROLLBACK TO SAVEPOINT #{name}", 'Savepoint') { super }
     end
 
     # @override
-    def release_savepoint(name = current_savepoint_name)
+    def release_savepoint(name = current_savepoint_name(false))
       log("RELEASE SAVEPOINT #{name}", 'Savepoint') { super }
     end
 

data/lib/arjdbc/version.rb

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

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

@@ -2959,18 +2959,22 @@ public class RubyJdbcConnection extends RubyObject {
 
     protected boolean isConnectionValid(final ThreadContext context, final Connection connection) {
         if ( connection == null ) return false;
-        final IRubyObject alive_sql = getConfigValue(context, "connection_alive_sql");
         Statement statement = null;
         try {
-            RubyString aliveSQL = alive_sql.isNil() ? null : alive_sql.convertToString();
+            final RubyString aliveSQL = getAliveSQL(context);
+            final RubyInteger aliveTimeout = getAliveTimeout(context);
             if ( aliveSQL != null && isSelect(aliveSQL) ) {
                 // expect a SELECT/CALL SQL statement
                 statement = createStatement(context, connection);
+                if (aliveTimeout != null) {
+                    statement.setQueryTimeout((int) aliveTimeout.getLongValue()); // 0 - no timeout
+                }
                 statement.execute( aliveSQL.toString() );
                 return true; // connection alive
             }
             else { // alive_sql nil (or not a statement we can execute)
-                return connection.isValid(0); // since JDBC 4.0
+                return connection.isValid(aliveTimeout == null ? 0 : (int) aliveTimeout.getLongValue()); // since JDBC 4.0
+                // ... isValid(0) (default) means no timeout applied
             }
         }
         catch (Exception e) {
@@ -2988,6 +2992,22 @@ public class RubyJdbcConnection extends RubyObject {
         finally { close(statement); }
     }
 
+    /**
+     * internal API do not depend on it
+     */
+    protected final RubyString getAliveSQL(final ThreadContext context) {
+        final IRubyObject alive_sql = getConfigValue(context, "connection_alive_sql");
+        return alive_sql.isNil() ? null : alive_sql.convertToString();
+    }
+
+    /**
+     * internal API do not depend on it
+     */
+    protected final RubyInteger getAliveTimeout(final ThreadContext context) {
+        final IRubyObject timeout = getConfigValue(context, "connection_alive_timeout");
+        return timeout.isNil() ? null : timeout.convertToInteger("to_i");
+    }
+
     private boolean tableExists(final Ruby runtime,
         final Connection connection, final TableName tableName) throws SQLException {
         final IRubyObject matchedTables =

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

@@ -47,6 +47,7 @@ import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyFloat;
+import org.jruby.RubyInteger;
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
 import org.jruby.exceptions.RaiseException;
@@ -97,9 +98,9 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         final ThreadContext context, final Ruby runtime,
         final int column, final int type, final ResultSet resultSet)
         throws SQLException {
-        if ( Types.BOOLEAN == type || Types.BIT == type ) {
-            final boolean value = resultSet.getBoolean(column);
-            return resultSet.wasNull() ? runtime.getNil() : runtime.newFixnum(value ? 1 : 0);
+        if ( type == Types.BIT ) {
+            final int value = resultSet.getInt(column);
+            return resultSet.wasNull() ? runtime.getNil() : runtime.newFixnum(value);
         }
         return super.jdbcToRuby(context, runtime, column, type, resultSet);
     }
@@ -154,6 +155,42 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         return time - ( offset / 1000.0 );
     }
 
+    @Override
+    protected final boolean isConnectionValid(final ThreadContext context, final Connection connection) {
+        if ( connection == null ) return false;
+        Statement statement = null;
+        try {
+            final RubyString aliveSQL = getAliveSQL(context);
+            final RubyInteger aliveTimeout = getAliveTimeout(context);
+            if ( aliveSQL != null ) {
+                // expect a SELECT/CALL SQL statement
+                statement = createStatement(context, connection);
+                if (aliveTimeout != null) {
+                    statement.setQueryTimeout((int) aliveTimeout.getLongValue()); // 0 - no timeout
+                }
+                statement.execute( aliveSQL.toString() );
+                return true; // connection alive
+            }
+            else { // alive_sql nil (or not a statement we can execute)
+                return connection.isValid(aliveTimeout == null ? 0 : (int) aliveTimeout.getLongValue()); // since JDBC 4.0
+                // ... isValid(0) (default) means no timeout applied
+            }
+        }
+        catch (Exception e) {
+            debugMessage(context, "connection considered broken due: " + e.toString());
+            return false;
+        }
+        catch (AbstractMethodError e) { // non-JDBC 4.0 driver
+            warn( context,
+                "WARN: driver does not support checking if connection isValid()" +
+                " please make sure you're using a JDBC 4.0 compilant driver or" +
+                " set `connection_alive_sql: ...` in your database configuration" );
+            debugStackTrace(context, e);
+            throw e;
+        }
+        finally { close(statement); }
+    }
+
     @Override
     protected IRubyObject indexes(final ThreadContext context, final String tableName, final String name, final String schemaName) {
         return withConnection(context, new Callable<IRubyObject>() {

data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

@@ -327,7 +327,7 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     public IRubyObject release_savepoint(final ThreadContext context, final IRubyObject name) {
         final Connection connection = getConnection(true);
         try {
-            if ( getSavepoints(context).get(name) == null ) {
+            if ( getSavepoints(context).remove(name) == null ) {
                 throw context.getRuntime().newRuntimeError("could not release savepoint: '" + name + "' (not set)");
             }
             // NOTE: JDBC driver does not implement release(Savepoint) :

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.18
+  version: 1.3.19
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord