activerecord-jdbc-alt-adapter 61.0.0-java → 61.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd61f85687802bf7bad5e3013413ccbda73395044d46775e8fa5f6d57e8410ca
-  data.tar.gz: 245c8e59a5bbf3e87e7f9f0759070dda617801ce650bdb089cb1c16daa4119eb
+  metadata.gz: 59345f12074c8042ddc27f2234fda3ed1e63a8b29610b45e42e6631621872a84
+  data.tar.gz: aa1ec94c11f8776a6ac82f00be956105d254d158cd88709f762dd02e3aa424eb
 SHA512:
-  metadata.gz: f11b067072016b63fa265435c90d45672463cc80e5ac1e8199bc96d209704affdc30a75d89a6ac5fb67ea5fad06c91c7ef59af87651e387beb360e64dc027e32
-  data.tar.gz: b1e71248871946ccaa981bb0a74f08fdeba605637b020f704ae0197dad96c00947cfe0f87752f010499d6ddad9a6a97ffe7791cb6f7a0dd69e4f57f2d7643014
+  metadata.gz: edaf34229e549b40849ff3ba02dd9cc00bde1d38d2dc4a5778ae4228597b0b4289e5314ba02fb7c201c6ea3b8be56f170bac91e7fd13e1cd4c82b1f49a4820c9
+  data.tar.gz: 02f8789a6fb0e82ececd0050c751d8bc1d71efe57363cff5bb7ee78b880c1a331418920de618ff206a77892528c26b78be5a35526432c6f17188e06cd1cdc472

data/.travis.yml

@@ -9,13 +9,14 @@ before_install:
   - rvm @default,@global do gem uninstall bundler -a -x -I || true
   - gem install bundler -v "~>1.17.3"
 install:
-- bundle install --retry 3 --without development
+- bundle config set --local without 'development'
+- bundle install
 # to fix this issue: https://travis-ci.community/t/mariadb-10-1-fails-to-install-on-xenial/3151/3
 - mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;' || true
 
 language: ruby
 rvm:
-  - jruby-9.2.14.0
+  - jruby-9.2.19.0
 jdk:
   - openjdk8
 
@@ -48,7 +49,7 @@ before_script:
 
 env:
   global:
-    - AR_VERSION="master"
+    - AR_VERSION="6-1-stable"
 matrix:
   allow_failures:
     - rvm: jruby-head

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArJdbc
-  VERSION = '61.0.0'
+  VERSION = '61.1.0'
 end

data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -387,7 +387,20 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
             RubyDate rubyDate = (RubyDate) value;
             DateTime dt = rubyDate.getDateTime();
             // pgjdbc needs adjustment for default JVM timezone
-            statement.setDate(index, new Date(dt.getMillis() - TZ_DEFAULT.getOffset(dt.getMillis())));
+            //
+            // If the date is a day when Daylight savings starts (2am changed to 3am),
+            // And we are in a positive GMT timezone (Australia/Melbourne)
+            // Then removing milliseconds equal to the TimeZone (+11 GMT),
+            // will result in the date being the previous day 23:00, because of the missing hour.
+            // So we check if the date after the shift is outside of daylight time and remove an hours worth of milliseconds.
+            final long dateMillis = dt.getMillis();
+            long offset =  TZ_DEFAULT.getOffset(dt.getMillis());
+            if (TZ_DEFAULT.inDaylightTime(new Date(dt.getMillis())) && !TZ_DEFAULT.inDaylightTime(new Date(dateMillis - offset))) {
+                offset -= 3600000; // 1 hour
+            }
+            Date utcShiftedDate = new Date(dateMillis - offset);
+
+            statement.setDate(index, utcShiftedDate);
             return;
         }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 61.0.0
+  version: 61.1.0
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement