changeset 878:dc33533e6468

Target timezone is in minutes, setTimeZone is in seconds
author Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date Wed, 28 Feb 2024 13:37:01 +0100 (13 months ago)
parents f31366ece930
children 6e8ff2818fa7
files src/main/java/org/monetdb/jdbc/MonetConnection.java src/main/java/org/monetdb/mcl/net/Parameter.java
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
 		}
 
--- 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;
 		}