[Libreoffice-commits] core.git: connectivity/source

Wastack btomi96 at gmail.com
Sun Dec 11 10:41:29 UTC 2016


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

New commits:
commit ea61a62323fe398d682da5bbf5b0d9e17d442212
Author: Wastack <btomi96 at gmail.com>
Date:   Tue Nov 29 10:10:30 2016 +0100

    tdf#104227 query boolean like infos correctly
    
    Change-Id: Ic862bb1ce3efa61d6a01fc56fb9e84cf98bb7cd0
    Reviewed-on: https://gerrit.libreoffice.org/31355
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-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 4c2e393..959b134 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1124,7 +1124,8 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
         aCurrentRow[5] = new ORowSetValueDecorator(xRow->getString(2)); // 5. GRANTOR
         aCurrentRow[6] = new ORowSetValueDecorator(xRow->getString(3)); // 6. GRANTEE
         aCurrentRow[7] = new ORowSetValueDecorator(xRow->getString(4)); // 7. Privilege
-        aCurrentRow[7] = new ORowSetValueDecorator(xRow->getBoolean(5)); // 8. Grantable
+        aCurrentRow[7] = new ORowSetValueDecorator( ( xRow->getShort(5) == 1 ) ?
+                    OUString("YES") : OUString("NO")); // 8. Grantable
 
         aResults.push_back(aCurrentRow);
     }
@@ -1721,7 +1722,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
         }
 
         // 4. NON_UNIQUE -- i.e. specifically negate here.
-        aCurrentRow[4] = new ORowSetValueDecorator(!xRow->getBoolean(5));
+        aCurrentRow[4] = new ORowSetValueDecorator(xRow->getShort(5) == 0);
         // 6. INDEX NAME
         aCurrentRow[6] = new ORowSetValueDecorator(sanitizeIdentifier(xRow->getString(4)));
 


More information about the Libreoffice-commits mailing list