activerecord-jdbc-adapter 50.7-java → 50.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e43eceb4342dcd38df2afea30c399188280b41a7b0fc5634117757ba233a249e
-  data.tar.gz: bc5338e82c5ae9b18049d45b91babb0a7810c79f2bec0b78e4394adff9f375dc
+  metadata.gz: 5478648fcae62c384d0b8aeb74486d827353baa4560835bf589048bd20050da3
+  data.tar.gz: 12d6e871274580e3dcbdf76e6b64daddae45fbd77c7bc7673e0f1416bd1a06c5
 SHA512:
-  metadata.gz: 6812c7e72ea43a931867455a61cd98a7f2cceb762fa54d276b9faebfa4d40cf10f0e3b0027891b39d1f914c6b6fcf77fdebfd02ef2544a2bd4f7b2b34ba12ff7
-  data.tar.gz: f13820dd1ea903f1e653e6fb260a2ccfc79248a8fded725ba6452bc0bb9169017423a111cb73525b12c15a48fe2009d6ee9c57122e2eeb419aef726cdeeb1243
+  metadata.gz: e9ae9c43b64186aa46d3df3e0e395778577f1db175fc84ea812687392b9a0437ef66ae4fdb42e7bfff717795dd1b0d93d2cf56944b7467f7fe222ecb6c6495b9
+  data.tar.gz: fe36ac65f5deb2e83bf8480c12292db537bc3ca5184c390495d8a459c1a91c2be4c5aa8ffa4ae8d5888a003eb74ece8b94e513e654f011670362a4c57a9d3a78

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '50.7'
+  VERSION = '50.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: '50.7'
+  version: '50.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