[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - connectivity/source

[Henry Castro (via logerrit)]

 connectivity/source/parse/sqliterator.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 0d579a1b8122eed6348ee4a512573277e2d5db77
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Wed Aug 30 10:25:51 2023 -0400
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Aug 31 18:15:31 2023 +0200

    connectiviy: fix to detect column data type
    
    if Base SQL query:
    
    SELECT COUNT("test"."id") from Test
    
    If changed to Spanish UI, detect the column type
    from a neutral context parser.
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: I1faa8ff8417a0fc4996b289bd2ce0baad52fc00c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156298
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/connectivity/source/parse/sqliterator.cxx 
b/connectivity/source/parse/sqliterator.cxx
index 64ea48d0351a..3428fba569e1 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -2109,7 +2109,11 @@ sal_Int32 
OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNo
                 nType = DataType::DOUBLE;
         }
         else
+        {
             nType = ::connectivity::OSQLParser::getFunctionReturnType( 
sFunctionName, &m_rParser.getContext() );
+            if (nType == DataType::SQLNULL)
+                nType = ::connectivity::OSQLParser::getFunctionReturnType( 
sFunctionName, m_rParser.getNeutral() );
+        }
     }
 
     return nType;