# HG changeset patch
# User Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
# Date 1612365819 -3600
# Node ID 709300b3228496075e5fbaccfa46d716f1f8f32b
# Parent  de2ef68b672fcf6b39a7f4d5a277b57ff2897402
Added entries for new Java 8 java.sql.Types: Types.TIME_WITH_TIMEZONE and Types.TIMESTAMP_WITH_TIMEZONE

diff --git a/src/main/java/org/monetdb/util/SQLExporter.java b/src/main/java/org/monetdb/util/SQLExporter.java
--- a/src/main/java/org/monetdb/util/SQLExporter.java
+++ b/src/main/java/org/monetdb/util/SQLExporter.java
@@ -135,7 +135,9 @@ public final class SQLExporter extends E
 						sb.append('(').append(size).append(')');
 					break;
 				case Types.TIME:
+				case Types.TIME_WITH_TIMEZONE:
 				case Types.TIMESTAMP:
+				case Types.TIMESTAMP_WITH_TIMEZONE:
 					if (size > 1)
 						sb.append('(').append(size -1).append(')');
 					if (digits == 1)	// flag is set to include suffix: WITH TIME ZONE
@@ -444,7 +446,9 @@ public final class SQLExporter extends E
 				case Types.BLOB:
 				case Types.DATE:
 				case Types.TIME:
+				case Types.TIME_WITH_TIMEZONE:
 				case Types.TIMESTAMP:
+				case Types.TIMESTAMP_WITH_TIMEZONE:
 					types[i] = QUOTE;
 					break;
 				case Types.NUMERIC:
diff --git a/src/main/java/org/monetdb/util/XMLExporter.java b/src/main/java/org/monetdb/util/XMLExporter.java
--- a/src/main/java/org/monetdb/util/XMLExporter.java
+++ b/src/main/java/org/monetdb/util/XMLExporter.java
@@ -219,6 +219,7 @@ public final class XMLExporter extends E
 					out.println("  </xsd:simpleType>");
 				break;
 				case Types.TIME:
+				case Types.TIME_WITH_TIMEZONE:
 					if ("timetz".equals(cols.getString(colTypeNmIndex))) {
 						ident = "TIME_WTZ";
 					} else {
@@ -235,6 +236,7 @@ public final class XMLExporter extends E
 					out.println("  </xsd:simpleType>");
 				break;
 				case Types.TIMESTAMP:
+				case Types.TIMESTAMP_WITH_TIMEZONE:
 					if ("timestamptz".equals(cols.getString(colTypeNmIndex))) {
 						ident = "TIMESTAMP_WTZ";
 					} else {
@@ -304,6 +306,7 @@ public final class XMLExporter extends E
 					ident = "DATE";
 				break;
 				case Types.TIME:
+				case Types.TIME_WITH_TIMEZONE:
 					if ("timetz".equals(cols.getString(colTypeNmIndex))) {
 						ident = "TIME_WTZ";
 					} else {
@@ -311,6 +314,7 @@ public final class XMLExporter extends E
 					}
 				break;
 				case Types.TIMESTAMP:
+				case Types.TIMESTAMP_WITH_TIMEZONE:
 					if ("timestamptz".equals(cols.getString(colTypeNmIndex))) {
 						ident = "TIMESTAMP_WTZ";
 					} else {
@@ -361,6 +365,7 @@ public final class XMLExporter extends E
 			for (int i = 1; i <= rsmd.getColumnCount(); i++) {
 				switch (rsmd.getColumnType(i)) {
 					case Types.TIMESTAMP:
+					case Types.TIMESTAMP_WITH_TIMEZONE:
 						final Timestamp ts = rs.getTimestamp(i);
 						if ("timestamptz".equals(rsmd.getColumnTypeName(i))) {
 							if (xsd_tstz == null) {