activerecord-jdbc-alt-adapter 50.5.0-java → 50.6.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9379d10ca13be5bdfe6b2d9e08f1f0bb90c12b4a87a11a2dbe4122742bd0fd4
-  data.tar.gz: 6fbff250cd49c44410829511184f0ef69e4d4aff5b6045da2b4a0d4421dd1387
+  metadata.gz: 6eee53bae892f228677fb5abcf5548fd9957731deade33f82446d70af7766365
+  data.tar.gz: cb8386a343a16d9a503eccac19261a5ce975b94613d79ab0d8dbfeee87f0b955
 SHA512:
-  metadata.gz: 69e281f1bdb34d112fca0a78193999b2c8b72e36006e5ac28a11de998f594a314baa156337359fa98b85d8055072a23f1ac1c867a672ffb4b305059332c6e3fa
-  data.tar.gz: 2c104450a45f8f84cf740b10ce079fa55e815300ceebcb8d22de91a44e8e33f1758907891e41738b3c9e73289300e3210bd49b7b7032b9de6ad5765ec8d12f17
+  metadata.gz: 36e77bf1b8f5795bda11f614f5e84743ab34f6ef9a802a28d7ca621727dca92987961e867011fc0ba51905e4a5158b89bb46670d265896d633114f0cc27d3fb3
+  data.tar.gz: c57e1fcf4b860f9f6466fbd7e2cfb7c4d34a5ce5b50bc647fdd4279d950c6aa41ffefa975a82269f20ab60be07a5a1f9ce64c95f75d420747ac3b3e8903828d9

data/.gitignore

@@ -2,6 +2,7 @@
 *.tgz
 *~
 *.log
+/log/
 patches*
 *#
 TAGS

data/Gemfile

@@ -49,7 +49,7 @@ group :test do
 
   gem 'bcrypt', '~> 3.1.11', require: false
   gem 'builder', require: false
-  gem 'jdbc-mssql', '~> 0.6.0', require: nil
+  gem 'jdbc-mssql', '~> 0.7.0', require: nil
 end
 
 group :rails do

data/lib/arjdbc/abstract/database_statements.rb

@@ -13,10 +13,10 @@ module ArJdbc
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
         if without_prepared_statement?(binds)
-          log(sql, name) { @connection.execute_insert(sql) }
+          log(sql, name) { @connection.execute_insert_pk(sql, pk) }
         else
           log(sql, name, binds) do
-            @connection.execute_insert(sql, binds)
+            @connection.execute_insert_pk(sql, binds, pk)
           end
         end
       end

data/lib/arjdbc/mssql/adapter.rb

@@ -134,6 +134,13 @@ module ActiveRecord
         super
       end
 
+      def reset!
+        # execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
+        # NOTE: it seems the above line interferes with the jdbc driver
+        # and ending up in connection closed, issue seen in rails 5.2 and 6.0
+        reconnect!
+      end
+
       def disable_referential_integrity
         tables = tables_with_referential_integrity
 

data/lib/arjdbc/mssql/connection_methods.rb

@@ -52,6 +52,8 @@ ArJdbc::ConnectionMethods.module_eval do
 
   # @note Assumes SQLServer SQL-JDBC driver on the class-path.
   def sqlserver_connection(config)
+    config = config.deep_dup
+
     config[:adapter_spec] ||= ::ArJdbc::MSSQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::MSSQLAdapter unless config.key?(:adapter_class)
 

data/lib/arjdbc/mssql/database_statements.rb

@@ -87,7 +87,7 @@ module ActiveRecord
         end
 
         def identity_column_name(table_name)
-          for column in columns(table_name)
+          for column in schema_cache.columns(table_name)
             return column.name if column.identity?
           end
           nil

data/lib/arjdbc/mssql/schema_statements.rb

@@ -57,7 +57,7 @@ module ActiveRecord
         # NOTE: This is ready, all implemented in the java part of adapter,
         # it uses MSSQLColumn, SqlTypeMetadata, etc.
         def columns(table_name)
-          @connection.columns(table_name)
+          log('JDBC: GETCOLUMNS', 'SCHEMA') { @connection.columns(table_name) }
         rescue => e
           raise translate_exception_class(e, nil)
         end

data/lib/arjdbc/mysql/connection_methods.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 ArJdbc::ConnectionMethods.module_eval do
   def mysql_connection(config)
+    config = config.deep_dup
     # NOTE: this isn't "really" necessary but Rails (in tests) assumes being able to :
     #   ActiveRecord::Base.mysql2_connection ActiveRecord::Base.configurations['arunit'].merge(database: ...)
     config = symbolize_keys_if_necessary(config)

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 ArJdbc::ConnectionMethods.module_eval do
   def postgresql_connection(config)
+    config = config.deep_dup
     # NOTE: this isn't "really" necessary but Rails (in tests) assumes being able to :
     #   ActiveRecord::Base.postgresql_connection ActiveRecord::Base.configurations['arunit'].merge(:insert_returning => false)
     # ... while using symbols by default but than configurations returning string keys ;(

data/lib/arjdbc/sqlite3/connection_methods.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 ArJdbc::ConnectionMethods.module_eval do
   def sqlite3_connection(config)
+    config = config.deep_dup
     config[:adapter_spec] ||= ::ArJdbc::SQLite3
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::SQLite3Adapter unless config.key?(:adapter_class)
 

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '50.5.0'
+  VERSION = '50.6.1'
 end

data/rakelib/rails.rake

@@ -57,7 +57,7 @@ namespace :rails do
       ruby_opts_string += " -C \"#{ar_path}\""
       ruby_opts_string += " -rbundler/setup"
       ruby_opts_string += " -rminitest -rminitest/excludes" unless ENV['NO_EXCLUDES'].eql?('true')
-      file_list = ENV["TEST"] ? FileList[ ENV["TEST"] ] : test_files_finder.call
+      file_list = ENV["TEST"] ? FileList[ ENV["TEST"].split(',') ] : test_files_finder.call
       file_list_string = file_list.map { |fn| "\"#{fn}\"" }.join(' ')
       # test_loader_code = "-e \"ARGV.each{|f| require f}\"" # :direct
       option_list = ( ENV["TESTOPTS"] || ENV["TESTOPT"] || ENV["TEST_OPTS"] || '' )

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

@@ -727,7 +727,10 @@ public class RubyJdbcConnection extends RubyObject {
 
     private void connectImpl(final boolean forceConnection) throws SQLException {
         setConnection( forceConnection ? newConnection() : null );
-        if ( forceConnection ) configureConnection();
+        if (forceConnection) {
+            if (getConnectionImpl() == null) throw new SQLException("Didn't get a connection. Wrong URL?");
+            configureConnection();
+        }
     }
 
     @JRubyMethod(name = "read_only?")
@@ -885,15 +888,31 @@ public class RubyJdbcConnection extends RubyObject {
         return mapQueryResult(context, connection, resultSet);
     }
 
+    private static String[] createStatementPk(IRubyObject pk) {
+        String[] statementPk;
+        if (pk instanceof RubyArray) {
+            RubyArray ary = (RubyArray) pk;
+            int size = ary.size();
+            statementPk = new String[size];
+            for (int i = 0; i < size; i++) {
+                statementPk[i] = sqlString(ary.eltInternal(i));
+            }
+        } else {
+            statementPk = new String[] { sqlString(pk) };
+        }
+        return statementPk;
+    }
+
     /**
      * Executes an INSERT SQL statement
      * @param context
      * @param sql
+     * @param pk Rails PK
      * @return ActiveRecord::Result
      * @throws SQLException
      */
-    @JRubyMethod(name = "execute_insert", required = 1)
-    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql) {
+    @JRubyMethod(name = "execute_insert_pk", required = 2)
+    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject pk) {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
                 Statement statement = null;
@@ -901,7 +920,13 @@ public class RubyJdbcConnection extends RubyObject {
                 try {
 
                     statement = createStatement(context, connection);
-                    statement.executeUpdate(query, Statement.RETURN_GENERATED_KEYS);
+
+                    if (pk == context.nil || pk == context.fals || !supportsGeneratedKeys(connection)) {
+                        statement.executeUpdate(query, Statement.RETURN_GENERATED_KEYS);
+                    } else {
+                        statement.executeUpdate(query, createStatementPk(pk));
+                    }
+
                     return mapGeneratedKeys(context, connection, statement);
 
                 } catch (final SQLException e) {
@@ -914,23 +939,35 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
+    @Deprecated
+    @JRubyMethod(name = "execute_insert", required = 1)
+    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql) {
+        return execute_insert_pk(context, sql, context.nil);
+    }
+
     /**
      * Executes an INSERT SQL statement using a prepared statement
      * @param context
      * @param sql
      * @param binds RubyArray of values to be bound to the query
+     * @param pk Rails PK
      * @return ActiveRecord::Result
      * @throws SQLException
      */
-    @JRubyMethod(name = "execute_insert", required = 2)
-    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql, final IRubyObject binds) {
+    @JRubyMethod(name = "execute_insert_pk", required = 3)
+    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject binds,
+                                         final IRubyObject pk) {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
                 PreparedStatement statement = null;
                 final String query = sqlString(sql);
                 try {
+                    if (pk == context.nil || pk == context.fals || !supportsGeneratedKeys(connection)) {
+                        statement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
+                    } else {
+                        statement = connection.prepareStatement(query, createStatementPk(pk));
+                    }
 
-                    statement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
                     setStatementParameters(context, connection, statement, (RubyArray) binds);
                     statement.executeUpdate();
                     return mapGeneratedKeys(context, connection, statement);
@@ -945,6 +982,12 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
+    @Deprecated
+    @JRubyMethod(name = "execute_insert", required = 2)
+    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject binds, final IRubyObject sql) {
+        return execute_insert_pk(context, sql, binds, context.nil);
+    }
+
     /**
      * Executes an UPDATE (DELETE) SQL statement
      * @param context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 50.5.0
+  version: 50.6.1
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.10
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server