monetdb-java: default - Target timezone is in minutes, setTimeZo...

[Joeri van Ruth via checkin-list]

Changeset: dc33533e6468 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/dc33533e6468
Modified Files:
        src/main/java/org/monetdb/jdbc/MonetConnection.java
        src/main/java/org/monetdb/mcl/net/Parameter.java
Branch: default
Log Message:

Target timezone is in minutes, setTimeZone is in seconds


diffs (35 lines):

diff --git a/src/main/java/org/monetdb/jdbc/MonetConnection.java 
b/src/main/java/org/monetdb/jdbc/MonetConnection.java
--- a/src/main/java/org/monetdb/jdbc/MonetConnection.java
+++ b/src/main/java/org/monetdb/jdbc/MonetConnection.java
@@ -234,7 +234,7 @@ public class MonetConnection
                                sendControlCommand("sizeheader 1");
                        }
                        if (!callback.timeZoneSet) {
-                               setTimezone(target.getTimezone());
+                               setTimezone(60 * target.getTimezone());
                        }
                }
 
@@ -3754,7 +3754,7 @@ public class MonetConnection
                                defaultFetchSize = target.getReplySize();
                        if (contribute(SqlOption.SizeHeader, 1))
                                sizeHeaderEnabled = true;
-                       if (contribute(SqlOption.TimeZone, 
target.getTimezone()))
+                       if (contribute(SqlOption.TimeZone, 60 * 
target.getTimezone()))
                                timeZoneSet = true;
                }
 
diff --git a/src/main/java/org/monetdb/mcl/net/Parameter.java 
b/src/main/java/org/monetdb/mcl/net/Parameter.java
--- a/src/main/java/org/monetdb/mcl/net/Parameter.java
+++ b/src/main/java/org/monetdb/mcl/net/Parameter.java
@@ -149,8 +149,8 @@ public enum Parameter {
                        case TIMEZONE:
                                Calendar cal = Calendar.getInstance();
                                int offsetMillis = 
cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET);
-                               int offsetSeconds = offsetMillis / 1000;
-                               return offsetSeconds;
+                               int offsetMinutes = offsetMillis / 60000;
+                               return offsetMinutes;
                        default:
                                return defaultValue;
                }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org