changeset 232:3c3345a298f2 embedded

Merge with default
author Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
date Fri, 18 May 2018 15:51:32 +0200 (2018-05-18)
parents 672523c56341 (current diff) 68b9452f1215 (diff)
children c1bbb542617d
files src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
diffstat 3 files changed, 61 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog file for monetdb-java
 # This file is updated with Maddlog
 
+* Wed May 23 2018 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new jars: monetdb-jdbc-2.28.jar, monetdb-mcl-1.17.jar
+  and updated jdbcclient.jar
+
 * Thu Apr 26 2018 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
 - Corrected and extended output of DatabaseMetaData methods
   getTimeDateFunctions() and getSystemFunctions().  The Date/Time functions
@@ -26,3 +30,10 @@
   comment has been set for the table / view / column / procedure / function
   via the SQL command COMMENT ON <db-object type> <qname> IS 'comment-text'.
 
+* Thu Dec 14 2017 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Fixed a problem with retrieving Dates and Timestamps which contained a
+  year value less than 1000. It would throw an SQLDataException with message:
+   Could not convert value to a Date. Expected JDBC date escape format
+   yyyy-[m]m-[d]d.
+  See also: https://www.monetdb.org/bugzilla/show_bug.cgi?id=6468
+
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,42 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past monetdb-java ChangeLog entries
 
+* Wed May 23 2018 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new jars: monetdb-jdbc-2.28.jar, monetdb-mcl-1.17.jar
+  and updated jdbcclient.jar
+
+* Thu Apr 26 2018 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected and extended output of DatabaseMetaData methods
+  getTimeDateFunctions() and getSystemFunctions().  The Date/Time functions
+  (curdate, current_date, current_time, current_timestamp, curtime,
+  local_timezone, localtime, localtimestamp) were returned by
+  getSystemFunctions() but are now returned by getTimeDateFunctions().
+  getTimeDateFunctions() now also lists functions: date_to_str, extract, now,
+  str_to_date, str_to_time, str_to_timestamp, time_to_str and timestamp_to_str.
+- Improved DatabaseMetaData methods getTablePrivileges() and
+  getColumnPrivileges() by returning also any combination of privileges
+  for the table or column in the PRIVILEGE result column. Previously only
+  single privileges (SELECT or UPDATE or INSERT or DELETE or EXECUTE or
+  GRANT) would be returned.
+
+* Thu Apr 19 2018 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected method DatabaseMetaData.getFunctions() for result column
+  FUNCTION_TYPE.  It used to return DatabaseMetaData.functionResultUnknown
+  value for Analytic (functions.type 6) and Loader function (functions type 7).
+  It now returns DatabaseMetaData.functionNoTable for Analytic functions and
+  DatabaseMetaData.functionReturnsTable for Loader functions.
+- DatabaseMetaData methods getTables(), getColumns(), getProcedures() and
+  getFunctions() now return the comment in the REMARKS result column when a
+  comment has been set for the table / view / column / procedure / function
+  via the SQL command COMMENT ON <db-object type> <qname> IS 'comment-text'.
+
+* Thu Dec 14 2017 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Fixed a problem with retrieving Dates and Timestamps which contained a
+  year value less than 1000. It would throw an SQLDataException with message:
+   Could not convert value to a Date. Expected JDBC date escape format
+   yyyy-[m]m-[d]d.
+  See also: https://www.monetdb.org/bugzilla/show_bug.cgi?id=6468
+
 * Mon Oct 23 2017 Sjoerd Mullender <sjoerd@acm.org>
 - Compiled and released new jars: monetdb-jdbc-2.27.jar, monetdb-mcl-1.16.jar
   and updated jdbcclient.jar
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -300,7 +300,7 @@ public class MonetDatabaseMetaData exten
 	/**
 	 * Does the database treat mixed case unquoted SQL identifiers
 	 * as case sensitive and as a result store them in mixed case?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns false.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns false.
 	 *
 	 * @return false
 	 */
@@ -345,7 +345,7 @@ public class MonetDatabaseMetaData exten
 	/**
 	 * Does the database treat mixed case quoted SQL identifiers as
 	 * case sensitive and as a result store them in mixed case?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -390,7 +390,7 @@ public class MonetDatabaseMetaData exten
 	/**
 	 * What is the string used to quote SQL identifiers?
 	 * This returns a space if identifier quoting isn't supported.
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver
+	 * A JDBC Compliant <sup>TM</sup> driver
 	 * will always use a double quote character.
 	 *
 	 * @return the quoting string
@@ -578,7 +578,7 @@ public class MonetDatabaseMetaData exten
 	 *
 	 * <p>If so, the SQL AS clause can be used to provide names for
 	 * computed columns or to provide alias names for columns as required.
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * <p>e.g.
 	 *
@@ -597,7 +597,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Are concatenations between NULL and non-NULL values NULL?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -763,7 +763,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Are table correlation names supported?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -844,7 +844,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Is the escape character in "LIKE" clauses supported?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -877,7 +877,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Can columns be defined as non-nullable.
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -925,7 +925,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Does this driver support the ANSI-92 entry level SQL grammar?
-	 * All JDBC Compliant <sup><font size=-2>TM</font></sup> drivers must return true.
+	 * All JDBC Compliant <sup>TM</sup> drivers must return true.
 	 *
 	 * @return true if so
 	 */
@@ -1201,7 +1201,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Are subqueries in comparison expressions supported?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 * MonetDB also supports this
 	 *
 	 * @return true if so; false otherwise
@@ -1213,7 +1213,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Are subqueries in 'exists' expressions supported?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * @return true if so; false otherwise
 	 */
@@ -1224,7 +1224,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Are subqueries in 'in' statements supported?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * @return true if so; false otherwise
 	 */
@@ -1235,7 +1235,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Are subqueries in quantified expressions supported?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * (No idea what this is, but we support a good deal of
 	 * subquerying.)
@@ -1249,7 +1249,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Are correlated subqueries supported?
-	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * A JDBC Compliant <sup>TM</sup> driver always returns true.
 	 *
 	 * (a.k.a. subselect in from?)
 	 *