activerecord-jdbc-alt-adapter 60.1.0-java → 60.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83a5e387ec9999cc730027498dec97428cfee7b3c3edcc6845a779c01c4272a
-  data.tar.gz: 3a7e9ce2b8e6e968bdb21f4ac72a9f498e3226c414ec4b003e4b463dffc74062
+  metadata.gz: fef06d854287aa90265b3470d9e126f556afee76bcf75d6efd887c0390b3570e
+  data.tar.gz: 45a22fd5240546ac6ae2de94bff4ced69c6155d0e78bce20feeabe65c51735e2
 SHA512:
-  metadata.gz: f71a50d80a6f01837512d87a52ef32ec69a245e1927086cc0736efa35835c57710652f1ad6c294039422ad69eea20d308b48df02ba8d43e7c1acea4de7358ee0
-  data.tar.gz: 732cde407f1c4ff98bb7e528ea183dd483e2b8edf8a475f60f445dc7580fd8e8d3374ca248b5d7eb2f02b1c596efdeed5ce7dc393563425565657ca6302d6145
+  metadata.gz: 6b8742114ade9460ca8f7bb5fe13db0f2d1ee5195e0d93aebcc68dd6a940c3601a8a7a641c02165adb37a2e458034eb438a0ccd6f7110b51a6427f4c37f3d5ce
+  data.tar.gz: 7f73c8c6bc76ff739af784a0d01faa0918c54e2cfa99e4394699ce9cd845ca6519561a4f59ef5002ec0c3a6cc6e17c21617ee975fce031ec4b1fb450019210f6

data/README.md

@@ -10,10 +10,10 @@ stable of this adapter and Rails
 
 | Gem Version | Rails Version | min JRuby |
 | ----------- | ------------- | --------- |
-| 50.6.1      | 5.0.7.2       | 9.1.x     |
-| 51.6.1      | 5.1.7         | 9.1.x     |
-| 52.5.1      | 5.2.4.1       | 9.1.x     |
-| 60.0.0      | 6.0.2         | 9.2.9     |
+| 50.7.0      | 5.0.7         | 9.1.x     |
+| 51.7.0      | 5.1.7         | 9.1.x     |
+| 52.6.0      | 5.2.4         | 9.1.x     |
+| 60.1.0      | 6.0.3         | 9.2.9     |
 
 This adapter passes most of the Rails tests (ActiveRecord tests) with the
 exception of some test that are not compatible with the SQL Server. To run
@@ -28,8 +28,8 @@ Add the following to your `Gemfile`:
 ```ruby
 platforms :jruby do
   # Use jdbc as the database for Active Record
-  gem 'activerecord-jdbc-alt-adapter', '~> 60.0.0'
-  gem 'jdbc-mssql', '~> 0.7.0'
+  gem 'activerecord-jdbc-alt-adapter', '~> 60.1.0'
+  gem 'jdbc-mssql', '~> 0.9.0'
 end
 ```
 

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,3 +1,3 @@
 module ArJdbc
-  VERSION = '60.1.0'
+  VERSION = '60.3.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: 60.1.0
+  version: 60.3.0
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.0.0
   name: activerecord
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -38,6 +38,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".nvimlog"
 - ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md
@@ -264,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server