activerecord-jdbc-alt-adapter 52.5.1-java → 52.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6cc4c4563f32b39f0ddac72fbfa090de13e23eefba9a95c14221787478f132
-  data.tar.gz: cc6754a427170292ebee5a56201bef82a3dd10cbf2034aff2e8e9d8b52575243
+  metadata.gz: 0bbef112a6aaadd08c19169b2e2b1826e99a44f38f2d2b2e3b441383ab95b91b
+  data.tar.gz: 444be17b783f8b937d57cdbd47260b79f4d69a75117523b4848ec9171d082c85
 SHA512:
-  metadata.gz: 91fff9a0aabfb206c84759e0370d92a9e843bc8b6271d38adde65292b534052a4bcc20b1a9d454ea40b28feef2b453f7b1c1a0aac12ae4c06625d71ac72164e0
-  data.tar.gz: e66da4371d5fc890788b6cfb3c7c483e7e7f7c706aba84195495b97ae3d5438353fefef852a4aee24bca044d6b3c75315f32f1f68f194cdbd299bb92ff3fc27c
+  metadata.gz: bc41292328eb23e4d84a13fcc5213c1a44780ee974c207b930ca17357304f7feef2497a3642c231ef350d91d371e631a108e72d74da8d5c734d5f3194257c76c
+  data.tar.gz: d2a6656b88aa2432a54b9de7b27066847136de6857b6848901d3f3551dd65f5aa92787dfc9f83c7e44195509faf86416eb59ef9a04627499dc4883388882df04

data/.gitignore

@@ -34,3 +34,5 @@ activerecord-jdbc.iml
 lib/arjdbc/jdbc/adapter_java.jar
 .jrubyrc
 tags
+pik.sh
+.ruby-version

data/README.md

@@ -8,9 +8,9 @@ use the [original adapter](https://github.com/jruby/active)
 This adapter only works with JRuby and it is advised to install the latest
 stable versions of Rails
 
-- For Rails `5.0.7.2` install the `50.3.1` version of this adapter
-- For Rails `5.1.7` install the `51.3.0` version of this adapter
-- For Rails `5.2.3` install the `52.2.0` version of this adapter
+- For Rails `5.0.7` install the `50.7.0` version of this adapter
+- For Rails `5.1.7` install the `51.7.0` version of this adapter
+- For Rails `5.2.4` install the `52.6.0` version of this adapter
 
 Support for Rails 6.0 is planned in the future.
 
@@ -24,8 +24,8 @@ Add the following to your `Gemfile`:
 ```ruby
 platforms :jruby do
   # Use jdbc as the database for Active Record
-  gem 'activerecord-jdbc-alt-adapter', '~> 50.3.1', require: 'arjdbc'
-  gem 'jdbc-mssql', '~> 0.6.0'
+  gem 'activerecord-jdbc-alt-adapter', '~> 52.6.0'
+  gem 'jdbc-mssql', '~> 0.9.0'
 end
 ```
 

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '52.5.1'
+  VERSION = '52.6.0'
 end

data/rakelib/01-tomcat.rake

@@ -1,6 +1,6 @@
 namespace :'tomcat-jndi' do # contains a FS JNDI impl (for tests)
 
-  TOMCAT_MAVEN_REPO = 'http://repo2.maven.org/maven2/org/apache/tomcat'
+  TOMCAT_MAVEN_REPO = 'https://repo1.maven.org/maven2/org/apache/tomcat'
   TOMCAT_VERSION = '7.0.54'
 
   DOWNLOAD_DIR = File.expand_path('../test/jars', File.dirname(__FILE__))
@@ -48,4 +48,4 @@ namespace :'tomcat-jndi' do # contains a FS JNDI impl (for tests)
     rm jar_path if File.exist?(jar_path)
   end
 
-end
+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

@@ -203,6 +203,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-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 52.5.1
+  version: 52.6.0
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,8 +20,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.3
   name: activerecord
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -273,8 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server