Kaydet (Commit) daa08c10 authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt

Add parameters to char/varchar in getTypeInfo. (firebird-sdbc)

This means that char/varchar columns can once again be created.

Change-Id: I081f1dd3abad6d007b1f957d72841983a1130f72
üst ded871e9
...@@ -819,8 +819,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -819,8 +819,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
// Common data // Common data
aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks
aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks // Create Params
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[7] = new ORowSetValueDecorator(sal_Bool(true)); // Nullable aRow[7] = new ORowSetValueDecorator(sal_Bool(true)); // Nullable
aRow[8] = new ORowSetValueDecorator(sal_Bool(true)); // Case sensitive aRow[8] = new ORowSetValueDecorator(sal_Bool(true)); // Case sensitive
aRow[10] = new ORowSetValueDecorator(sal_Bool(false)); // Is unsigned aRow[10] = new ORowSetValueDecorator(sal_Bool(false)); // Is unsigned
...@@ -836,6 +835,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -836,6 +835,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[1] = new ORowSetValueDecorator(OUString("CHAR")); aRow[1] = new ORowSetValueDecorator(OUString("CHAR"));
aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TEXT)); aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TEXT));
aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision = max length aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision = max length
aRow[6] = new ORowSetValueDecorator(OUString("length"));
aRow[9] = new ORowSetValueDecorator( aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable sal_Int16(ColumnSearch::FULL)); // Searchable
aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
...@@ -848,6 +848,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -848,6 +848,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR")); aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR"));
aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_VARYING)); aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_VARYING));
aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision = max length aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision = max length
aRow[6] = new ORowSetValueDecorator(OUString("length"));
aRow[9] = new ORowSetValueDecorator( aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable sal_Int16(ColumnSearch::FULL)); // Searchable
aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
...@@ -858,6 +859,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -858,6 +859,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
// Integer Types common // Integer Types common
{ {
aRow[6] = new ORowSetValueDecorator();
aRow[9] = new ORowSetValueDecorator( aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable sal_Int16(ColumnSearch::FULL)); // Searchable
aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
...@@ -883,6 +885,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -883,6 +885,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
// Decimal Types common // Decimal Types common
{ {
aRow[6] = new ORowSetValueDecorator();
aRow[9] = new ORowSetValueDecorator( aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable sal_Int16(ColumnSearch::FULL)); // Searchable
aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
...@@ -916,6 +919,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -916,6 +919,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[1] = new ORowSetValueDecorator(OUString("timestamp")); aRow[1] = new ORowSetValueDecorator(OUString("timestamp"));
aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TIMESTAMP)); aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TIMESTAMP));
aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length
aRow[6] = new ORowSetValueDecorator();
aRow[9] = new ORowSetValueDecorator( aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable sal_Int16(ColumnSearch::FULL)); // Searchable
aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
...@@ -929,6 +933,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -929,6 +933,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[1] = new ORowSetValueDecorator(OUString("TIME")); aRow[1] = new ORowSetValueDecorator(OUString("TIME"));
aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TYPE_TIME)); aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TYPE_TIME));
aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length
aRow[6] = new ORowSetValueDecorator();
aRow[9] = new ORowSetValueDecorator( aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable sal_Int16(ColumnSearch::FULL)); // Searchable
aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
...@@ -942,6 +947,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -942,6 +947,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[1] = new ORowSetValueDecorator(OUString("DATE")); aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TYPE_DATE)); aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TYPE_DATE));
aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max length
aRow[6] = new ORowSetValueDecorator();
aRow[9] = new ORowSetValueDecorator( aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable sal_Int16(ColumnSearch::FULL)); // Searchable
aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
...@@ -955,6 +961,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -955,6 +961,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[1] = new ORowSetValueDecorator(OUString("BLOB")); aRow[1] = new ORowSetValueDecorator(OUString("BLOB"));
aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_BLOB)); aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_BLOB));
aRow[3] = new ORowSetValueDecorator(sal_Int32(0)); // Prevision = max length aRow[3] = new ORowSetValueDecorator(sal_Int32(0)); // Prevision = max length
aRow[6] = new ORowSetValueDecorator();
aRow[9] = new ORowSetValueDecorator( aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::NONE)); // Searchable sal_Int16(ColumnSearch::NONE)); // Searchable
aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment