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

data/src/java/arjdbc/util/DateTimeUtils.java

@@ -37,6 +37,7 @@ import org.jruby.Ruby;
 import org.jruby.RubyFloat;
 import org.jruby.RubyString;
 import org.jruby.RubyTime;
+import org.jruby.ext.date.RubyDateTime;
 import org.jruby.javasupport.Java;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
@@ -632,14 +633,21 @@ public abstract class DateTimeUtils {
      */
     public static String timestampTimeToString(final ThreadContext context,
                                                final IRubyObject value, DateTimeZone zone, boolean withZone) {
-        RubyTime timeValue = toTime(context, value);
-        DateTime dt = timeValue.getDateTime();
+        DateTime dt;
+        int usec = 0;
+        if (value instanceof RubyDateTime) {
+            dt = ((RubyDateTime) value).getDateTime();
+        } else {
+            RubyTime timeValue = toTime(context, value);
+            dt = timeValue.getDateTime();
+            usec = (int) timeValue.getUSec();
+        }
 
         StringBuilder sb = new StringBuilder(36);
 
         int year = dt.getYear();
         if (year <= 0) {
-            year--;
+            if (!(value instanceof RubyDateTime)) year--;
         } else if (zone != null) {
             dt = dateTimeInZone(dt, zone);
             year = dt.getYear();
@@ -659,7 +667,7 @@ public abstract class DateTimeUtils {
         if (year < 0) sb.append(" BC");
         sb.append(' ');
 
-        appendTime(sb, chrono, millis, (int) timeValue.getUSec(), withZone);
+        appendTime(sb, chrono, millis, usec, withZone);
 
         return sb.toString();
     }

metadata

@@ -1,24 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 52.5.1
+  version: 60.2.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-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0
   name: activerecord
   prerelease: false
   type: :runtime
@@ -26,18 +23,12 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0
 description: 'Fork of the ActiveRecord JDBC adapter with support for SQL Server and
   Azure SQL, for more information and help look at the README file in the github repository.
   AR-JDBC is a database adapter for Rails'' ActiveRecord component designed to be
   used with JRuby built upon Java''s JDBC API for database access. Provides (ActiveRecord)
-  built-in adapters: MySQL, PostgreSQL and SQLite3 as well as adapters for popular
-  databases such as Oracle, SQLServer, DB2, FireBird and even Java (embed) databases:
-  Derby, HSQLDB and H2. It allows to connect to virtually any JDBC-compliant database
-  with your JRuby on Rails application.'
+  built-in adapters: MySQL,  PostgreSQL, SQLite3, and SQLServer.'
 email:
 - nick@nicksieger.com
 - ola.bini@gmail.com
@@ -47,6 +38,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".nvimlog"
 - ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md
@@ -273,8 +265,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.1.6
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server