activerecord-jdbc-adapter 52.6-java → 52.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c826f98de6265c91b7b4e9eedc261ff0e56256138c72d6b8983b5426a98ba39
-  data.tar.gz: 5d5c55caa8eedc053dad096e2eff709132cf050dfc20b7c06681ae6871aa4fb7
+  metadata.gz: 7e10da6d252a05adeedfb0b57fbd49bb6e2b8af28df60c5005adada50ea29bc4
+  data.tar.gz: 18a6f90b2c900b81e9e820e7c79f6478697baa3114ebc3938d67caceacc04e79
 SHA512:
-  metadata.gz: ce7713c92cce62c8c9813778f4eb25362f1f886ea1ec0dc44d0f89257603bd7e7c926e25acebd4ddb3b6b4c0398c89e566982c26769b2c020ac6d5449aa9eb8e
-  data.tar.gz: c1bddfe622adf99a5260a7046f5ab704b2e3cee09047215e9554117e2260d9a1b35a704d366b08fe03e367c4780898e06348a27aca3a3604c1375bb23c6b9a68
+  metadata.gz: 304c31adfc470ac2852af55ecd84dab23be302df35917cdd683aeadd94c30fa86dae2b040e9b637365684f120677a5fcbbf6f8f6daa00d90f41f5ebd743f08e9
+  data.tar.gz: 68d730d2b58312cdc63acd4fb46e5d208436dfa6e9d2ec16086ec2c381efb5d8fc0cd6d1af7bf740e840084a26fb99489f43463d04456eef68a9c7ceb224585a

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '52.6'
+  VERSION = '52.7'
 end

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

@@ -2348,7 +2348,7 @@ public class RubyJdbcConnection extends RubyObject {
             return RubyString.newString(runtime, DateTimeUtils.dateToString(value));
         }
 
-        return DateTimeUtils.newDateAsTime(context, value, null).callMethod(context, "to_date");
+        return DateTimeUtils.newDateAsTime(context, value, DateTimeZone.UTC).callMethod(context, "to_date");
     }
 
     protected IRubyObject timeToRuby(final ThreadContext context,

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: '52.6'
+  version: '52.7'
 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