Merge pull request #1058 from dr-itz/rails6-dev

[postgres] fix setting date when timezone offset is negative

Author: enebo

.travis.yml

@@ -69,6 +69,9 @@ matrix:
     - addons:
         postgresql: "10"
       env: DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql PREPARED_STATEMENTS=true JRUBY_OPTS=-J-Duser.timezone=America/Detroit
     - addons:
         postgresql: "9.4"
       env: DB=postgresql PREPARED_STATEMENTS=true

src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -36,26 +36,18 @@
 import java.lang.StringBuilder;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.sql.*;
+import java.sql.Date;
+import java.util.*;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
+import org.joda.time.DateTime;
 import org.jruby.*;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.ext.bigdecimal.RubyBigDecimal;
+import org.jruby.ext.date.RubyDate;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -115,6 +107,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
 
     // Used to wipe trailing 0's from points (3.0, 5.6) -> (3, 5.6)
     private static final Pattern pointCleanerPattern = Pattern.compile("\\.0\\b");
+    private static final TimeZone TZ_DEFAULT = TimeZone.getDefault();
 
     private RubyClass resultClass;
     private RubyHash typeMap = null;
@@ -386,7 +379,20 @@ protected void setDateParameter(final ThreadContext context,
             }
         }
 
-        super.setDateParameter(context, connection, statement, index, value, attribute, type);
+        if ( ! "Date".equals(value.getMetaClass().getName()) && value.respondsTo("to_date") ) {
+            value = value.callMethod(context, "to_date");
+        }
+
+        if (value instanceof RubyDate) {
+            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())));
+            return;
+        }
+
+        // NOTE: assuming Date#to_s does right ...
+        statement.setDate(index, Date.valueOf(value.toString()));
     }
 
     @Override

test/db/postgresql/date_test.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+require 'db/postgres'
+
+class DateTest < Test::Unit::TestCase
+
+  class CreatePosts < ActiveRecord::Migration[5.0]
+    def self.up
+      create_table :posts, force: true do |t|
+        t.date :published_on
+      end
+    end
+    def self.down
+      drop_table :posts
+    end
+  end
+
+  def setup
+    CreatePosts.up
+  end
+
+  def teardown
+    CreatePosts.down
+  end
+
+  class Post < ActiveRecord::Base
+  end
+
+  def test_prepared_statement_for_date_column_sends_correct_date_to_postgres
+    Post.create!
+    date = Date.new(2020, 2, 12)
+    Post.first.update_columns published_on: date
+
+    assert_equal date, Post.first.published_on
+  ensure
+    Post.connection.execute 'TRUNCATE posts;'
+  end
+
+  def test_unprepared_statement_for_date_column_sends_correct_date_to_postgres
+    Post.create!
+    date = Date.new(2020, 2, 12)
+
+    ActiveRecord::Base.connection.unprepared_statement do
+      Post.first.update_columns published_on: date
+    end
+
+    assert_equal date, Post.first.published_on
+  ensure
+    Post.connection.execute 'TRUNCATE posts;'
+  end
+
+  def test_raw_arel_for_date_column_sends_correct_date_to_postgres
+    Post.create!
+    date = Date.new(2020, 2, 12)
+
+    update_arel = Arel::UpdateManager.new
+    update_arel.table Post.arel_table
+    update_arel.set [
+                        [Post.arel_table[:published_on], date]
+                    ]
+    Post.connection.update update_arel
+
+    assert_equal date, Post.first.published_on
+  ensure
+    Post.connection.execute 'TRUNCATE posts;'
+  end
+end