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

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 6155fae67c104dd38114a8888bacb31e19fe565d
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Fri Aug 30 16:59:58 2019 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Aug 31 08:35:17 2019 +0200

    tdf#118809: Fill DatabaseProductName and DatabaseProductVersion for Firebird
    
    Thank you to Drew Jensen for the suggestion here:
    https://bugs.documentfoundation.org/show_bug.cgi?id=118809#c3
    
    Change-Id: Ie9b5a2c744b158100b2306b27b1d56a30afc5182
    Reviewed-on: https://gerrit.libreoffice.org/78302
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 50785ac52579153ed78a4fba268a54fd4d0e710e)
    Reviewed-on: https://gerrit.libreoffice.org/78335
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index f3fad5ff3636..71543c013913 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -598,12 +598,17 @@ OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
 
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  )
 {
-    return OUString();
+    uno::Reference< XStatement > xSelect = m_pConnection->createStatement();
+
+    uno::Reference< XResultSet > xRs = xSelect->executeQuery("SELECT rdb$get_context('SYSTEM', 'ENGINE_VERSION') as version from rdb$database");
+    xRs->next(); // first and only row
+    uno::Reference< XRow > xRow( xRs, UNO_QUERY_THROW );
+    return xRow->getString(1);
 }
 
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  )
 {
-    return OUString();
+    return "Firebird (engine12)";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  )