summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-12-27 16:58:05 +0100
committerJulien Nabet <serval2412@yahoo.fr>2021-12-27 20:39:59 +0100
commit30fb61f80bba3b119d2fbfb450e3cf1ae7e65d59 (patch)
tree78e63f410e7afcae9d6b9bcecb52c8c9aeab2f06
parentRelated tdf#130595: SQL_NULL means pVar->sqldata = nullptr (diff)
downloadcore-30fb61f80bba3b119d2fbfb450e3cf1ae7e65d59.tar.gz
core-30fb61f80bba3b119d2fbfb450e3cf1ae7e65d59.zip
tdf#130595: Parameter query with :parameter IS NULL doesn't work
Problematic SQL here: SELECT * FROM "Table1" WHERE "Name" = :name OR :name IS NULL Firebird considers there are 2 parameters. When providing an empty string, no pb, OPreparedStatement::setNull is called which is ok for both parameters When providing a non empty string, we go to OPreparedStatement::setString. For first param no pb but for second param, sql type is SQL_NULL so it must be taken into account See https://www.firebirdsql.org/file/documentation/html/en/refdocs/fblangref25/firebird-25-language-reference.html#fblangref25-datatypes-special-sqlnull for full details Change-Id: I80dff259d85957e8547c098e4c48b642cce26804 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127572 Reviewed-by: Lionel Mamane <lionel@mamane.lu> Tested-by: Jenkins
-rw-r--r--connectivity/source/drivers/firebird/PreparedStatement.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 3b5511518957..db49ad2e4d8d 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -264,6 +264,12 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex,
setBoolean(nParameterIndex, boolValue);
break;
}
+ case SQL_NULL:
+ {
+ // See https://www.firebirdsql.org/file/documentation/html/en/refdocs/fblangref25/firebird-25-language-reference.html#fblangref25-datatypes-special-sqlnull
+ pVar->sqldata = nullptr;
+ break;
+ }
default:
::dbtools::throwSQLException(
"Incorrect type for setString",