changeset 218:5cc7101c5c8d

Corrected method DatabaseMetaData.getFunctions().
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 19 Apr 2018 19:03:40 +0200 (2018-04-19)
parents 7cbd20ff628c
children 4572f0694fde
files ChangeLog src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # This file is updated with Maddlog
 
 * 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 when the internal function type was 6 (Analytic function) or 7
+  (Loader function).  It now returns DatabaseMetaData.functionNoTable value
+  for those 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
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -3909,6 +3909,8 @@ public class MonetDatabaseMetaData exten
 			.append(" WHEN 3 THEN ").append(DatabaseMetaData.functionNoTable)
 			.append(" WHEN 4 THEN ").append(DatabaseMetaData.functionNoTable)
 			.append(" WHEN 5 THEN ").append(DatabaseMetaData.functionReturnsTable)
+			.append(" WHEN 6 THEN ").append(DatabaseMetaData.functionNoTable)
+			.append(" WHEN 7 THEN ").append(DatabaseMetaData.functionNoTable)
 			.append(" ELSE ").append(DatabaseMetaData.functionResultUnknown).append(" END AS \"FUNCTION_TYPE\", " +
 			// only the id value uniquely identifies a function. Include it to be able to differentiate between multiple overloaded functions with the same name
 			"cast(\"functions\".\"id\" as varchar(10)) AS \"SPECIFIC_NAME\" " +