connectivity/source/drivers/firebird/PreparedStatement.cxx | 10 ++++---- connectivity/source/drivers/firebird/Util.cxx | 16 ++++--------- 2 files changed, 10 insertions(+), 16 deletions(-)
New commits: commit 85f17f9ea822421c6d31da90d7be83089f58cec2 Author: Lionel Elie Mamane <[email protected]> Date: Fri Dec 18 16:54:00 2015 +0100 tdf#96572 firebird correctly transmit request for NULL even if column is not nullable Change-Id: I72ceda68e983125aef26c8f0aacc06320bd16b77 diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index a29c822..be8d8eb 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -704,13 +704,13 @@ void OPreparedStatement::setParameterNull(sal_Int32 nParameterIndex, bool bSetNull) { XSQLVAR* pVar = m_pInSqlda->sqlvar + (nParameterIndex - 1); - if (pVar->sqltype & 1) + if (bSetNull) { - if (bSetNull) - *pVar->sqlind = -1; - else - *pVar->sqlind = 0; + pVar->sqltype |= 1; + *pVar->sqlind = -1; } + else + *pVar->sqlind = 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx index ddb9d02..00eb4aa 100644 --- a/connectivity/source/drivers/firebird/Util.cxx +++ b/connectivity/source/drivers/firebird/Util.cxx @@ -254,11 +254,8 @@ void firebird::mallocSQLVAR(XSQLDA* pSqlda) assert(false); break; } - if (pVar->sqltype & 1) - { - /* allocate variable to hold NULL status */ - pVar->sqlind = static_cast<short *>(malloc(sizeof(short))); - } + /* allocate variable to hold NULL status */ + pVar->sqlind = static_cast<short *>(malloc(sizeof(short))); } } @@ -302,13 +299,10 @@ void firebird::freeSQLVAR(XSQLDA* pSqlda) break; } - if (pVar->sqltype & 1) + if(pVar->sqlind) { - if(pVar->sqlind) - { - free(pVar->sqlind); - pVar->sqlind = nullptr; - } + free(pVar->sqlind); + pVar->sqlind = nullptr; } } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
