changeset 222:75a5b5754020

Correction: Loader functions (type = 7) should return a table.
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 26 Apr 2018 19:33:12 +0200 (2018-04-26)
parents d034679a1a00
children e8139dbe3883
files ChangeLog src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,9 +18,9 @@
 * 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 function types.
+  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
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -3928,7 +3928,7 @@ public class MonetDatabaseMetaData exten
 			.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(" WHEN 7 THEN ").append(DatabaseMetaData.functionReturnsTable)
 			.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\" " +