[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit dce1ee4b8df674fa10380e53a8c2ca786823803b
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Aug 31 10:05:20 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 5 11:06:43 2019 +0200

    Related tdf#118809: add some XDatabaseMetaData for Firebird
    
    getStringFunctions
    getTimeDateFunctions
    getNumericFunctions
    
    Thank you Drew Jensen for suggestion
    (see https://bugs.documentfoundation.org/show_bug.cgi?id=118809#c4)
    
    Change-Id: I1e3b7d9559f4e520260de39ee4b8ad078cc80c87
    Reviewed-on: https://gerrit.libreoffice.org/78337
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 58bed4f3c03098e72cd05cd298136a7029c05a6d)
    Reviewed-on: https://gerrit.libreoffice.org/78338
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 71543c013913..bd2aae8de53d 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -638,12 +638,15 @@ OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  )
 
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  )
 {
-    return OUString();
+    return "ASCII_CHAR,ASCII_VAL,BIT_LENGTH,CHAR_LENGTH,CHAR_TO_UUID,CHARACTER_LENGTH,"
+           "GEN_UUID,HASH,LEFT,LOWER,LPAD,OCTET_LENGTH,OVERLAY,POSITION,REPLACE,REVERSE,"
+           "RIGHT,RPAD,SUBSTRING,TRIM,UPPER,UUID_TO_CHAR";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  )
 {
-    return OUString();
+    return "CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,DATEADD, DATEDIFF,"
+           "EXTRACT,'NOW','TODAY','TOMORROW','YESTERDAY'";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
@@ -653,7 +656,9 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
 
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  )
 {
-    return OUString();
+    return "ABS,ACOS,ASIN,ATAN,ATAN2,BIN_AND,BIN_NOT,BIN_OR,BIN_SHL,"
+           "BIN_SHR,BIN_XOR,CEIL,CEILING,COS,COSH,COT,EXP,FLOOR,LN,"
+           "LOG,LOG10,MOD,PI,POWER,RAND,ROUND,SIGN,SIN,SINH,SQRT,TAN,TANH,TRUNC";
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  )