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

[Henry Castro (via logerrit)]

 connectivity/source/parse/sqlnode.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc0d4b6292901d783b4678fddca0d821e927e4d4
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Wed Aug 30 10:09:05 2023 -0400
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Oct 25 11:03:27 2023 +0200

    connectivity: fix return column type "DataType::SQLNULL"
    
    The Base SQL query:
    
    SELECT COUNT( "Test"."id" ) FROM "Test"
    
    And the UI language is set to Spanish, the function
    "getFunctionReturnType" returns misleading column type.
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: I2b57d1dfc005711374d7ae0de66b412f4f551d89
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156295
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156422
    Tested-by: Jenkins
    (cherry picked from commit 50f36b75cee6591a00102c6e9fa71ba91df5bbd8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158272
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index 4f213bf4f902..052b6b15cb05 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2494,7 +2494,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, 
const SQLParseNodeParamet
 
 sal_Int32 OSQLParser::getFunctionReturnType(std::u16string_view 
_sFunctionName, const IParseContext* pContext)
 {
-    sal_Int32 nType = DataType::VARCHAR;
+    sal_Int32 nType = DataType::SQLNULL;
     OString 
sFunctionName(OUStringToOString(_sFunctionName,RTL_TEXTENCODING_UTF8));
 
     
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ASCII,pContext))) 
                    nType = DataType::INTEGER;