activerecord-jdbc-adapter 51.7-java → 51.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a472f8ed7911f754bafc83ddf5d34fa061fda0d8b78a0a0d263e54ac4ae59ffa
-  data.tar.gz: 1fd596cb2615ab284b647d6546e40eab484c9718890d0ee90e5a9220610762cc
+  metadata.gz: c33e6546ab301a1eda15ef885b651360416932c02d874898f4c525299f255ec8
+  data.tar.gz: 5dfa0451c604112c903937e165d0d43279650a5c172250edc2688573e9719932
 SHA512:
-  metadata.gz: 7686dceb4704955a36053011ae7da81abc6384bd8ad213a171f99c2becb1d814138192f6f05923e2bfd1434e395b59e38418ffcd57ab7324d352c6a9a96b4bf2
-  data.tar.gz: 0030c4eb8f4e61615f7d30b4a1693fa26729144e32484bfc02edccf418fe339f79736c0c4039e89a6e81159d9e45dbbf10cf18deab6bd2f5c3ee75ffa24db137
+  metadata.gz: 57e42a917703c855155d0ed9eba2d3a410a3d6e29c720054344f576c28510c058ba7cacf1d279757af85749188dc07d5ce53e657d4c042440fa9afa0c56d128c
+  data.tar.gz: d337cc0ae05de8983fbcfbaaffe1f6ef9a1eca8bc7f65f82972d5b8f9409166c3e8c745cd6be04d5eed2f7d7f997d53c41cceb2397ad39302ab598db3c433e3d

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '51.7'
+  VERSION = '51.8'
 end

data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java

@@ -200,6 +200,57 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         });
     }
 
+    /**
+     * Executes an INSERT SQL statement
+     * @param context
+     * @param sql
+     * @param pk Rails PK
+     * @return ActiveRecord::Result
+     * @throws SQLException
+     */
+    @Override
+    @JRubyMethod(name = "execute_insert_pk", required = 2)
+    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject pk) {
+
+        // MSSQL does not like composite primary keys here so chop it if there is more than one column
+        IRubyObject modifiedPk = pk;
+
+        if (pk instanceof RubyArray) {
+            RubyArray ary = (RubyArray) pk;
+            if (ary.size() > 0) {
+                modifiedPk = ary.eltInternal(0);
+            }
+        }
+
+        return super.execute_insert_pk(context, sql, modifiedPk);
+    }
+
+    /**
+     * 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
+     */
+    @Override
+    @JRubyMethod(name = "execute_insert_pk", required = 3)
+    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject binds,
+                                         final IRubyObject pk) {
+        // MSSQL does not like composite primary keys here so chop it if there is more than one column
+        IRubyObject modifiedPk = pk;
+
+        if (pk instanceof RubyArray) {
+            RubyArray ary = (RubyArray) pk;
+            if (ary.size() > 0) {
+                modifiedPk = ary.eltInternal(0);
+            }
+        }
+
+        return super.execute_insert_pk(context, sql, binds, modifiedPk);
+    }
+
     @Override
     protected Integer jdbcTypeFor(final String type) {
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: '51.7'
+  version: '51.8'
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement