diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2019-07-13 16:39:31 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-07-17 12:26:55 +0200 |
| commit | 3173e00f428ea8cf79f36efb38d15028aca01d4a (patch) | |
| tree | befbb26c700292244360d3b44f2eba5de67721f3 | |
| parent | d250c94d78ac7e79753aa30f869db919b01fc450 (diff) | |
tdf#123150: Firebird: set UTF-8 client connection
There are two options related to character sets when attaching or
creating a database with the C API:
- isc_dpb_lc_ctype: Sets the character set of the connection between the
Firebird server and the Client (which is the sdbc driver in that case).
That is required in order to pass UTF 8 literals correctly.
- isc_dpb_set_db_charset: Sets the default character set of the database
itself. It has the same effect as the following SQL statement:
ALTER DATABASE SET DEFAULT CHARACTER SET <Charset>
We need to set both of them to UTF-8.
Change-Id: Ia9e5a4b87a3997c084be8abb68c2de813fbd631b
Reviewed-on: https://gerrit.libreoffice.org/75557
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Tested-by: Tamás Bunth <btomi96@gmail.com>
(cherry picked from commit c19c206cf42ac178906a855ae3cd198e0fcf8d14)
Reviewed-on: https://gerrit.libreoffice.org/75755
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins
| -rw-r--r-- | connectivity/source/drivers/firebird/Connection.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index ba2fba974d78..c707ca2c15ad 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -227,11 +227,15 @@ void Connection::construct(const OUString& url, const Sequence< PropertyValue >& dpbBuffer.push_back(1); // 1 byte long dpbBuffer.push_back(FIREBIRD_SQL_DIALECT); - // set UTF8 as default character set + // set UTF8 as default character set of the database const char sCharset[] = "UTF8"; dpbBuffer.push_back(isc_dpb_set_db_charset); dpbBuffer.push_back(sizeof(sCharset) - 1); dpbBuffer.append(sCharset); + // set UTF8 as default character set of the connection + dpbBuffer.push_back(isc_dpb_lc_ctype); + dpbBuffer.push_back(sizeof(sCharset) - 1); + dpbBuffer.append(sCharset); // Do any more dpbBuffer additions here |