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

[Lionel Elie Mamane]

 connectivity/source/commontools/parameters.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b78cabc850e0a71873714c892c46c9edb25fd364
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Apr 28 17:19:44 2017 +0200

    tdf#107457 don't quote columns referred by expression (not by name)
    
    Change-Id: I4894313ec27d716e9899c885ddc6be38a2447689
    Reviewed-on: https://gerrit.libreoffice.org/37078
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 32c2cc0a520a..fa57c5750424 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -224,7 +224,12 @@ namespace dbtools
         {
             OUString colName;
             xDetailField->getPropertyValue("RealName") >>= colName;
-            sFilter += quoteName( m_sIdentifierQuoteString, colName ) + " = :";
+            sal_Bool isFunction(false);
+            xDetailField->getPropertyValue("Function") >>= isFunction;
+            if (isFunction)
+                sFilter += colName;
+            else
+                sFilter += quoteName( m_sIdentifierQuoteString, colName );
         }
 
         // generate a parameter name which is not already used
@@ -235,7 +240,7 @@ namespace dbtools
             o_rNewParamName += "_";
         }
 
-        return sFilter += o_rNewParamName;
+        return sFilter += " =:" + o_rNewParamName;
     }