[Libreoffice-commits] core.git: connectivity/source

[Tamás Bunth]

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1b81754f3f269d06f66fd5b56037ff79138ae512
Author: Tamás Bunth <btomi96 at gmail.com>
Date:   Sat Apr 8 11:44:41 2017 +0200

    tdf#106866 query character size instead of bytes
    
    Change-Id: I7639fb1accdf728a8170ddb7dc9caf84bad8d3ef
    Reviewed-on: https://gerrit.libreoffice.org/36289
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index a7e89b21d700..bb1ac1d449dd 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1126,7 +1126,8 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
         // for domains, whether a specific field is nullable is set in relfields,
         // this is also the one we manually fiddle when changin NULL/NOT NULL
         // (see Table.cxx)
-        "relfields.RDB$NULL_FLAG "      // 11
+        "relfields.RDB$NULL_FLAG, "      // 11
+        "fields.RDB$CHARACTER_LENGTH "   // 12
         "FROM RDB$RELATION_FIELDS relfields "
         "JOIN RDB$FIELDS fields "
         "on (fields.RDB$FIELD_NAME = relfields.RDB$FIELD_SOURCE) "
@@ -1192,7 +1193,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
             {
                 case SQL_TEXT:
                 case SQL_VARYING:
-                    aColumnSize = xRow->getShort(8);
+                    aColumnSize = xRow->getShort(12);
                     break;
                 case SQL_SHORT:
                 case SQL_LONG: