summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-12-06 11:02:31 +0100
committerJulien Nabet <serval2412@yahoo.fr>2020-12-06 14:33:43 +0100
commit9ccfe37486cb8caa018c714a670514fcedbe4a0f (patch)
tree689b1168b5af12122ac394ddfe4a06f99e12f45b
parentc808dc652ff5c899c4b7f1b676b5a0a0074db1da (diff)
tdf#125957: FIREBIRD Datatype Binary(fix)[CHAR] couldn't be filled with contentfeature/cib_contract57e
Really use sCharsetName which is xRow->getString(13) trimmed See commit bf662904c4b60e93c6b86e06288d41996eed12a2 Author: Tamas Bunth <tamas.bunth@collabora.co.uk> Date: Sat Dec 16 12:57:43 2017 +0100 tdf#104734 Firebird: Add Binary (fix) type There is no explicit binary type in Firebird. It can be accomplished using the CHAR type with a special character set, which tells the database that it is binary data and there is no collation. (called OCTETS). Because of that, we also need the character set to decide the exact column type. And also refactor some parts of the driver: - Create class to determine internal type from firebird type, subtype, scale and character set. - Use internal type (DataType::XXX) in XDatabaseMetaData::getTypeInfo() indirectly. (We want to return a Firebird type for each internal type, not in the opposite direction. Change-Id: I3c9c764d353eeead5e8c00f1142846725eecce15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107295 Reviewed-by: Lionel Mamane <lionel@mamane.lu> Tested-by: Jenkins
-rw-r--r--connectivity/source/drivers/firebird/DatabaseMetaData.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index fdcfd1d64f89..229642d73a5b 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1195,7 +1195,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
// result field may be filled with spaces
sCharsetName = sCharsetName.trim();
ColumnTypeInfo aInfo(aType, xRow->getShort(7), aScale,
- xRow->getString(13));
+ sCharsetName);
aCurrentRow[5] = new ORowSetValueDecorator(aInfo.getSdbcType());
// 6. Typename (SQL_*)