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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd61f85687802bf7bad5e3013413ccbda73395044d46775e8fa5f6d57e8410ca
-  data.tar.gz: 245c8e59a5bbf3e87e7f9f0759070dda617801ce650bdb089cb1c16daa4119eb
+  metadata.gz: aaaf1a1ed8cb06e36bf0a6667be9ec1ce05d68a10f416449443c559be91e5fe2
+  data.tar.gz: 9447c46dfff607cc8a4cd177644229a55d660cecd3debb98ce123a12b4ee9704
 SHA512:
-  metadata.gz: f11b067072016b63fa265435c90d45672463cc80e5ac1e8199bc96d209704affdc30a75d89a6ac5fb67ea5fad06c91c7ef59af87651e387beb360e64dc027e32
-  data.tar.gz: b1e71248871946ccaa981bb0a74f08fdeba605637b020f704ae0197dad96c00947cfe0f87752f010499d6ddad9a6a97ffe7791cb6f7a0dd69e4f57f2d7643014
+  metadata.gz: 49cbdc1c2e924fb00c5a5ff0af6dba814c976eec8c1b1dd08fe0b8e28dd4babee04f354248ccffc73f4f8bd7f09b12360c9fe87befde93b3b89a7859a551d053
+  data.tar.gz: afc769af1ce09137cbeb9d714fd02791a13a71c0685747eea934ab635413d035baca60e99c9c911f5cd510c93c848fb073e79e77f4f8dcb42520fbf2267430e5

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/mssql/connection_methods.rb

@@ -78,12 +78,15 @@ ArJdbc::ConnectionMethods.module_eval do
       url << "sendTimeAsDatetime=#{config[:send_time_as_datetime] || false};"
       url << "loginTimeout=#{config[:login_timeout].to_i};" if config[:login_timeout]
       url << "lockTimeout=#{config[:lock_timeout].to_i};"
+      url << "encrypt=#{config[:encrypt]};" if config.key?(:encrypt)
+      url << "trustServerCertificate=#{config[:trust_server_certificate]};" if config.key?(:trust_server_certificate)
       app = config[:appname] || config[:application]
       url << "applicationName=#{app};" if app
       isc = config[:integrated_security] # Win only - needs sqljdbc_auth.dll
       url << "integratedSecurity=#{isc};" unless isc.nil?
       url
     end
+
     jdbc_connection(config)
   end
   alias_method :jdbcsqlserver_connection, :sqlserver_connection

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArJdbc
-  VERSION = '61.0.0'
+  VERSION = '61.2.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.2.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: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server