activerecord-jdbc-adapter 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ea14fa2985e6b568284ddd24df9db9511f6437
-  data.tar.gz: 72570ca5a15d8f3bd04b3efc5c9b3c7b86911215
+  metadata.gz: ebdc2f21df1a1fbe848c242a5a9c6e351a20056e
+  data.tar.gz: 67e764365675757678fc29d3a2422faaa0b2920a
 SHA512:
-  metadata.gz: 72bbce793d260cfdd46f81007543bd0e6aff6a81149b45e0d21de5cef98e0c96b6cdb1127b1dc7ab03a372510a664c70996dd879ca7d7a53f5a3b32f89466a0e
-  data.tar.gz: 07087ad9b681f0c0d6cb4008fc5f432991baf24fd62615e9864d8c420938c8585767c324493c239888ff50550bd76aa1b5a3e943eb0716d4a14615dbd36ad39d
+  metadata.gz: 006bb63ddde830d1b02a26c5780349d1ad7e6204dbcd9195583fcf65b11f102a22e4e9dab43a6e242c344293503dd56140b6fa55f7b48e967289785b74bec88a
+  data.tar.gz: e9e05577e5fb7965d0a5b38b64f1b7985d9412a31f5d0c7d414a4e8c1b865293ca8e77c120ee7402b7088c70c4a0b9c3f93a07c77868cde11a27ed9406b61e52

data/.travis.yml

@@ -3,8 +3,7 @@ bundler_args: --without development
 script: bundle exec rake test_$DB
 before_script: export JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
 before_install:
-  #- gem update --system 2.1.11
-  #- 'ruby -e "puts RUBY_VERSION" | grep ^1\.8 && gem update --system -v 2.1.11 || true'
+  - jruby --1.9 -S gem update --system 2.1.11
 rvm:
   - jruby
 gemfile:

data/Gemfile

@@ -20,8 +20,8 @@ gem 'appraisal', :require => nil
 
 # appraisal ignores group block declarations :
 
-gem 'test-unit', '2.5.4', :group => :test
-gem 'test-unit-context', '>= 0.3.0', :group => :test
+gem 'test-unit', '~> 2.5.4', :group => :test
+gem 'test-unit-context', '>= 0.4.0', :group => :test
 gem 'mocha', '~> 0.13.1', :require => nil, :group => :test
 
 gem 'simplecov', :require => nil, :group => :test

data/History.md

@@ -1,3 +1,16 @@
+## 1.3.6 (02/04/14)
+
+- fix rails 4-0-stable compatibility (see #530)
+- [mysql] support "disabling" abandoned connection cleanup thread
+- [mssql] Handling of 'GROUP BY' and selected columns (#529)
+  + SELECT DISTINCT clause with ORDER BY for MSSQL (partially fixes #437)
+- [derby] only do the patched select_limited_ids if connection is Derby's
+- [derby] support getting and setting transaction isolation on a connection
+  + allow to configure whether isolation will be 'serializable' (work-around for #497)
+- match 'int' as well as 'integer' when converting to SQL types for MSSQL (#527)
+
+Code Contributors: Sean McCarthy, Jesko, Konstantin Shabanov
+
 ## 1.3.5 (01/10/14)
 
 We're now green against Rails 4.1 (master), test and report issues if any.
@@ -8,7 +21,6 @@ We're now green against Rails 4.1 (master), test and report issues if any.
 - [firebird] Insert quotes for blobs to prevent failed inserts on not-null cols
 
 Code Contributors: Ray Zane, Gary S. Weaver
-Code Contributors: @rzane, @garysweaver
 
 ## 1.3.4 (12/12/13)
 

data/lib/arjdbc/derby/active_record_patch.rb

@@ -1,9 +1,10 @@
-# Needed because Rails is broken wrt to quoting of some values. 
-# Most databases are nice about it, but not Derby. 
+# Needed because Rails is broken wrt to quoting of some values.
+# Most databases are nice about it, but not Derby.
 # The real issue is that you can't compare a CHAR value to a NUMBER column.
 ActiveRecord::Associations::ClassMethods.module_eval do
   private
   def select_limited_ids_list(options, join_dependency)
+    return super unless connection.is_a?(ArJdbc::Derby)
     connection.select_all(
       construct_finder_sql_for_association_limiting(options, join_dependency),
       "#{name} Load IDs For Limited Eager Loading"

data/lib/arjdbc/derby/adapter.rb

@@ -109,7 +109,9 @@ module ArJdbc
 
     def configure_connection
       # must be done or SELECT...FOR UPDATE won't work how we expect :
-      execute("SET ISOLATION = SERIALIZABLE")
+      tx_isolation = config[:transaction_isolation] # set false to leave as is
+      tx_isolation = :serializable if tx_isolation.nil?
+      @connection.transaction_isolation = tx_isolation if tx_isolation
       # if a user name was specified upon connection, the user's name is the
       # default schema for the connection, if a schema with that name exists
       set_schema(config[:schema]) if config.key?(:schema)

data/lib/arjdbc/jdbc/adapter.rb

@@ -507,8 +507,8 @@ module ActiveRecord
 
       # @private
       # @override
-      def select_rows(sql, name = nil)
-        exec_query_raw(sql, name).map!(&:values)
+      def select_rows(sql, name = nil, binds = [])
+        exec_query_raw(sql, name, binds).map!(&:values)
       end
 
       if ActiveRecord::VERSION::MAJOR > 3 # expects AR::Result e.g. from select_all

data/lib/arjdbc/mssql/adapter.rb

@@ -123,7 +123,7 @@ module ArJdbc
         'NVARCHAR(MAX)'
       elsif NO_LIMIT_TYPES.include?(type_s)
         super(type)
-      elsif type_s == 'integer'
+      elsif type_s == 'integer' || type_s == 'int'
         if limit.nil? || limit == 4
           'int'
         elsif limit == 2
@@ -360,6 +360,32 @@ module ArJdbc
       execute "EXEC sp_rename '#{table_name}.#{column_name}', '#{new_column_name}', 'COLUMN'"
     end
 
+    # SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.
+    # MSSQL requires the ORDER BY columns in the select list for distinct queries.
+    def distinct(columns, order_by)
+      "DISTINCT #{columns_for_distinct(columns, order_by)}"
+    end
+
+    def columns_for_distinct(columns, orders)
+      return columns if orders.blank?
+
+      # construct a clean list of column names from the ORDER BY clause,
+      # removing any ASC/DESC modifiers
+      order_columns = [ orders ]; order_columns.flatten! # AR 3.x vs 4.x
+      order_columns.map! do |column|
+        column = column.to_sql unless column.is_a?(String) # handle AREL node
+        column.split(',').collect!{ |s| s.split.first }
+      end.flatten!
+      order_columns.reject!(&:blank?)
+      order_columns = order_columns.zip(0...order_columns.size).to_a
+      order_columns = order_columns.map{ |s, i| "#{s}" }
+
+      columns = [ columns ]; columns.flatten!
+      columns.push( *order_columns ).join(', ')
+      # return a DISTINCT clause that's distinct on the columns we want but
+      # includes all the required columns for the ORDER BY to work properly
+    end
+
     # @override
     def change_column(table_name, column_name, type, options = {})
 

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -24,13 +24,34 @@ module ArJdbc
               rest_of_query = "#{from_table}.#{rest_of_query}"
             end
 
+            # Ensure correct queries if the rest_of_query contains a 'GROUP BY'. Otherwise the following error occurs:
+            #   ActiveRecord::StatementInvalid: ActiveRecord::JDBCError: Column 'users.id' is invalid in the select list because it is not contained in either an aggregate function or the GROUP BY clause.
+            #   SELECT t.* FROM ( SELECT ROW_NUMBER() OVER(ORDER BY users.id) AS _row_num, [users].[lft], COUNT([users].[lft]) FROM [users] GROUP BY [users].[lft] HAVING COUNT([users].[lft]) > 1 ) AS t WHERE t._row_num BETWEEN 1 AND 1
+            if rest_of_query.downcase.include?('group by')
+              if order.count(',') == 0
+                order.gsub!(/ORDER BY (.*)/, 'ORDER BY MIN(\1)')
+              else
+                raise('Only one order condition allowed.')
+              end
+            end
+
             if distinct # select =~ /DISTINCT/i
               order = order.gsub(/([a-z0-9_])+\./, 't.')
               new_sql = "SELECT t.* FROM "
               new_sql << "( SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, t.* FROM (#{select} #{rest_of_query}) AS t ) AS t"
               new_sql << " WHERE t._row_num BETWEEN #{start_row} AND #{end_row}"
             else
-              new_sql = "#{select} t.* FROM "
+              select_columns_before_from = rest_of_query.gsub(/FROM.*/, '').strip
+              only_one_column            = !select_columns_before_from.include?(',')
+              only_one_id_column         = only_one_column && (select_columns_before_from.ends_with?('.id') || select_columns_before_from.ends_with?('.[id]'))
+
+              if only_one_id_column
+                # If there's only one id column a subquery will be created which only contains this column
+                new_sql = "#{select} t.id FROM "
+              else
+                # All selected columns are used
+                new_sql = "#{select} t.* FROM "
+              end
               new_sql << "( SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{rest_of_query} ) AS t"
               new_sql << " WHERE t._row_num BETWEEN #{start_row} AND #{end_row}"
             end

data/lib/arjdbc/version.rb

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

data/rakelib/02-test.rake

@@ -1,17 +1,20 @@
 require File.expand_path('../../test/shared_helper', __FILE__)
 
+test_tasks = [ 'test_mysql', 'test_sqlite3', 'test_postgresql_with_hint' ]
 if defined?(JRUBY_VERSION)
-  databases = [ :test_mysql, :test_sqlite3, :test_derby, :test_hsqldb, :test_h2 ]
-  databases << :test_postgres if PostgresHelper.have_postgres?(false)
-  databases << :test_jdbc ; databases << :test_jndi
-  task :test do
-    unless PostgresHelper.have_postgres?
-      warn "... won't run test_postgres tests"
-    end
-    databases.each { |task| Rake::Task[task.to_s].invoke }
+  test_tasks.push :test_derby, :test_hsqldb, :test_h2
+  test_tasks.push :test_jndi, :test_jdbc
+end
+
+desc "Run \"most\" available test_xxx tasks"
+task :test => test_tasks
+
+task 'test_postgresql_with_hint' do
+  if PostgresHelper.have_postgres?(false)
+    Rake::Task['test_postgresql'].invoke
+  else
+    puts "NOTE: won't run test_postgresql"
   end
-else
-  task :test => [ :test_mysql ]
 end
 
 def set_test_task_compat_version(task)
@@ -26,14 +29,18 @@ def set_task_description(task, desc)
     task = task.name if task.is_a?(Rake::TestTask)
     task = Rake::Task[task]
   end
-  # reset the desc set-up by TestTask :
-  task.instance_variable_set(:@full_comment, nil)
+  # reset the description set-up by TestTask :
+  if task.instance_variable_defined? :@full_comment
+    task.instance_variable_set(:@full_comment, nil)
+  else
+    task.instance_variable_get(:@comments).clear
+  end
   task.add_description(desc)
 end
 
 task 'test_appraisal_hint' do
   next if File.exists?('.disable-appraisal-hint')
-  unless (ENV['BUNDLE_GEMFILE'] rescue '') =~ /gemfiles\/.*?\.gemfile/
+  unless (ENV['BUNDLE_GEMFILE'] || '') =~ /gemfiles\/.*?\.gemfile/
     appraisals = []; Appraisal::File.each { |file| appraisals << file.name }
     puts "HINT: specify AR version with `rake appraisal:{version} test_{adapter}'" +
          " where version=(#{appraisals.join('|')}) (`touch .disable-appraisal-hint' to disable)"
@@ -80,8 +87,8 @@ test_task_for :MSSQL, :driver => :jtds, :database_name => 'MS-SQL (SQLServer)'
 test_task_for :MySQL, :prereqs => 'db:mysql'
 test_task_for :PostgreSQL, :prereqs => 'db:postgresql', :driver => 'postgres'
 task :test_postgres => :test_postgresql # alias
-task :test_pgsql => :test_postgresql # alias
 test_task_for :SQLite3
+task :test_sqlite => :test_sqlite3 # alias
 test_task_for :Firebird
 
 # ensure driver for these DBs is on your class-path

data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java

@@ -118,4 +118,46 @@ public class DerbyRubyJdbcConnection extends RubyJdbcConnection {
         return super.matchTables(runtime, connection, catalog, schemaPattern, tablePattern, types, checkExistsOnly);
     }
 
+    @JRubyMethod(name = "transaction_isolation", alias = "get_transaction_isolation")
+    public IRubyObject get_transaction_isolation(final ThreadContext context) {
+        return withConnection(context, new Callable<IRubyObject>() {
+            public IRubyObject call(final Connection connection) throws SQLException {
+                final int level = connection.getTransactionIsolation();
+                final String isolationSymbol = formatTransactionIsolationLevel(level);
+                if ( isolationSymbol == null ) return context.getRuntime().getNil();
+                return context.getRuntime().newSymbol(isolationSymbol);
+            }
+        });
+    }
+
+    @JRubyMethod(name = "transaction_isolation=", alias = "set_transaction_isolation")
+    public IRubyObject set_transaction_isolation(final ThreadContext context, final IRubyObject isolation) {
+        return withConnection(context, new Callable<IRubyObject>() {
+            public IRubyObject call(final Connection connection) throws SQLException {
+                final int level;
+                if ( isolation.isNil() ) {
+                    level = connection.getMetaData().getDefaultTransactionIsolation();
+                }
+                else {
+                    level = mapTransactionIsolationLevel(isolation);
+                }
+
+                connection.setTransactionIsolation(level);
+
+                final String isolationSymbol = formatTransactionIsolationLevel(level);
+                if ( isolationSymbol == null ) return context.getRuntime().getNil();
+                return context.getRuntime().newSymbol(isolationSymbol);
+            }
+        });
+    }
+
+    public static String formatTransactionIsolationLevel(final int level) {
+        if ( level == Connection.TRANSACTION_READ_UNCOMMITTED ) return "read_uncommitted"; // 1
+        if ( level == Connection.TRANSACTION_READ_COMMITTED ) return "read_committed"; // 2
+        if ( level == Connection.TRANSACTION_REPEATABLE_READ ) return "repeatable_read"; // 4
+        if ( level == Connection.TRANSACTION_SERIALIZABLE ) return "serializable"; // 8
+        if ( level == 0 ) return null;
+        throw new IllegalArgumentException("unexpected transaction isolation level: " + level);
+    }
+
 }

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

@@ -29,6 +29,7 @@ import arjdbc.jdbc.RubyJdbcConnection;
 import arjdbc.jdbc.Callable;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -234,10 +235,48 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
     @Override
     protected Connection newConnection() throws RaiseException, SQLException {
         final Connection connection = super.newConnection();
+        if ( doStopCleanupThread() ) shutdownCleanupThread();
         if ( doKillCancelTimer(connection) ) killCancelTimer(connection);
         return connection;
     }
 
+    private static Boolean stopCleanupThread;
+    static {
+        final String stopThread = System.getProperty("arjdbc.mysql.stop_cleanup_thread");
+        if ( stopThread != null ) stopCleanupThread = Boolean.parseBoolean(stopThread);
+    }
+
+    private static boolean doStopCleanupThread() throws SQLException {
+        // TODO when refactoring default behavior to "stop" consider not doing so for JNDI
+        return stopCleanupThread != null && stopCleanupThread.booleanValue();
+    }
+
+    private static boolean cleanupThreadShutdown;
+
+    private static void shutdownCleanupThread() {
+        if ( cleanupThreadShutdown ) return;
+        try {
+            Class threadClass = Class.forName("com.mysql.jdbc.AbandonedConnectionCleanupThread");
+            threadClass.getMethod("shutdown").invoke(null);
+        }
+        catch (ClassNotFoundException e) {
+            debugMessage("INFO: missing MySQL JDBC cleanup thread: " + e);
+        }
+        catch (NoSuchMethodException e) {
+            debugMessage( e.toString() );
+        }
+        catch (IllegalAccessException e) {
+            debugMessage( e.toString() );
+        }
+        catch (InvocationTargetException e) {
+            debugMessage( e.getTargetException().toString() );
+        }
+        catch (SecurityException e) {
+            debugMessage( e.toString() );
+        }
+        finally { cleanupThreadShutdown = true; }
+    }
+
     private static Boolean killCancelTimer;
     static {
         final String killTimer = System.getProperty("arjdbc.mysql.kill_cancel_timer");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.1.9
+rubygems_version: 2.1.11
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.