Changeset: 894abb249de1 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=894abb249de1
Modified Files:
        ChangeLog
        src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
Branch: default
Log Message:

Corrected 3 MonetDatabaseMetaData methods


diffs (52 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,14 @@
 # This file is updated with Maddlog
 
 * Wed Jul 31 2019 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
+- Corrected MonetDatabaseMetaData methods:
+  - getNumericFunctions(): it now includes function: pi.
+  - getSystemFunctions(): it no longer lists numeric functions: pi and rand.
+  - supportsSchemasInIndexDefinitions(): changed from true to false
 - Optimised MonetStatement memory resource usage by only creating an ArrayList
   and ReentrantLock object when the batch methods addBatch() or executeBatch()
-  are called. In most Statement usages those methods are not called.
-- Implemented method MonetClob.getAsciiStream()
+  are called. In most Statement usages those methods are never called.
+- Implemented method MonetClob.getAsciiStream().
 
 * Thu Mar 21 2019 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
 - Added implementation of java.sql.CallableStatement interface. Some standard
diff --git a/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java 
b/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -494,7 +494,7 @@ public class MonetDatabaseMetaData exten
                        " AND \"type\" = 1" +   // only scalar functions
                        // exclude functions which belong to the 'str' module
                        " AND \"mod\" <> 'str')" +      // to filter out string 
functions: 'code' and 'space'
-                       " OR \"name\" IN 
('degrees','fuse','ms_round','ms_str','ms_trunc','radians')";
+                       " OR \"name\" IN 
('degrees','fuse','pi','ms_round','ms_str','ms_trunc','radians')";
                return getConcatenatedStringFromQuery(FunctionsSelect + 
FunctionsWhere + match + OrFunctionsMaxMin + FunctionsOrderBy1);
        }
 
@@ -520,7 +520,7 @@ public class MonetDatabaseMetaData exten
                        " AND \"type\" = 1" +   // only scalar functions
                        // exclude functions which belong to the 'mtime' module
                        " AND \"mod\" <> 'mtime'" +
-                       " AND \"name\" NOT IN ('localtime','localtimestamp')" +
+                       " AND \"name\" NOT IN 
('localtime','localtimestamp','pi','rand')" +
                        // add system functions which are not listed in 
sys.functions but implemented in the SQL parser (see sql/server/sql_parser.y)
                        " UNION SELECT 'cast'" +
                        " UNION SELECT 'coalesce'" +
@@ -1114,7 +1114,9 @@ public class MonetDatabaseMetaData exten
         */
        @Override
        public boolean supportsSchemasInIndexDefinitions() {
-               return true;
+               // we currently do NOT support: create index sch.tblidx on 
sch.tbl(col);
+               // only: create index tblidx on sch.tbl(col);
+               return false;
        }
 
        /**
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to