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

[Andrzej J.R. Hunt]

 connectivity/source/drivers/firebird/FDatabaseMetaData.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit daa08c1027e62c76c171628e2a2e6adce0ad3a45
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Wed Jul 31 10:36:27 2013 +0200

    Add parameters to char/varchar in getTypeInfo. (firebird-sdbc)
    
    This means that char/varchar columns can once again be created.
    
    Change-Id: I081f1dd3abad6d007b1f957d72841983a1130f72

diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index 539df19..52f44ca 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -819,8 +819,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
 
         // Common data
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks
-        aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks
-        aRow[6] = new ORowSetValueDecorator();               // Create Params
+        aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks             // Create Params
         aRow[7] = new ORowSetValueDecorator(sal_Bool(true)); // Nullable
         aRow[8] = new ORowSetValueDecorator(sal_Bool(true)); // Case sensitive
         aRow[10] = new ORowSetValueDecorator(sal_Bool(false)); // Is unsigned
@@ -836,6 +835,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
         aRow[1] = new ORowSetValueDecorator(OUString("CHAR"));
         aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TEXT));
         aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision = max length
+        aRow[6] = new ORowSetValueDecorator(OUString("length"));
         aRow[9] = new ORowSetValueDecorator(
                 sal_Int16(ColumnSearch::FULL)); // Searchable
         aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
@@ -848,6 +848,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
         aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR"));
         aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_VARYING));
         aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision = max length
+        aRow[6] = new ORowSetValueDecorator(OUString("length"));
         aRow[9] = new ORowSetValueDecorator(
                 sal_Int16(ColumnSearch::FULL)); // Searchable
         aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
@@ -858,6 +859,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
 
         // Integer Types common
         {
+            aRow[6] = new ORowSetValueDecorator();
             aRow[9] = new ORowSetValueDecorator(
                 sal_Int16(ColumnSearch::FULL)); // Searchable
             aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
@@ -883,6 +885,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
 
         // Decimal Types common
         {
+            aRow[6] = new ORowSetValueDecorator();
             aRow[9] = new ORowSetValueDecorator(
                 sal_Int16(ColumnSearch::FULL)); // Searchable
             aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
@@ -916,6 +919,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
         aRow[1] = new ORowSetValueDecorator(OUString("timestamp"));
         aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TIMESTAMP));
         aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length
+        aRow[6] = new ORowSetValueDecorator();
         aRow[9] = new ORowSetValueDecorator(
                 sal_Int16(ColumnSearch::FULL)); // Searchable
         aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
@@ -929,6 +933,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
         aRow[1] = new ORowSetValueDecorator(OUString("TIME"));
         aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TYPE_TIME));
         aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length
+        aRow[6] = new ORowSetValueDecorator();
         aRow[9] = new ORowSetValueDecorator(
                 sal_Int16(ColumnSearch::FULL)); // Searchable
         aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
@@ -942,6 +947,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
         aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
         aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TYPE_DATE));
         aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length
+        aRow[6] = new ORowSetValueDecorator();
         aRow[9] = new ORowSetValueDecorator(
                 sal_Int16(ColumnSearch::FULL)); // Searchable
         aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
@@ -955,6 +961,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
         aRow[1] = new ORowSetValueDecorator(OUString("BLOB"));
         aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_BLOB));
         aRow[3] = new ORowSetValueDecorator(sal_Int32(0)); // Prevision = max length
+        aRow[6] = new ORowSetValueDecorator();
         aRow[9] = new ORowSetValueDecorator(
                 sal_Int16(ColumnSearch::NONE)); // Searchable
         aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value