Tag: cws_src680_oj14 User: oj Date: 06/03/20 00:19:08 Modified: /dba/connectivity/source/commontools/ FDatabaseMetaDataResultSetMetaData.cxx
Log: remove duplicate code File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: FDatabaseMetaDataResultSetMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx?r1=1.3&r2=1.3.26.1 Delta lines: +29 -87 --------------------- --- FDatabaseMetaDataResultSetMetaData.cxx 8 Sep 2005 05:09:38 -0000 1.3 +++ FDatabaseMetaDataResultSetMetaData.cxx 20 Mar 2006 08:19:04 -0000 1.3.26.1 @@ -4,9 +4,9 @@ * * $RCSfile: FDatabaseMetaDataResultSetMetaData.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.26.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:09:38 $ + * last change: $Author: oj $ $Date: 2006/03/20 08:19:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -221,22 +221,7 @@ // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() { - m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"), - ColumnValue::NULLABLE, - 3,3,0, - DataType::VARCHAR); - m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"), - ColumnValue::NULLABLE, - 3,3,0, - DataType::VARCHAR); - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"), - ColumnValue::NO_NULLS, - 3,3,0, - DataType::VARCHAR); - m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"), - ColumnValue::NO_NULLS, - 3,3,0, - DataType::VARCHAR); + setColumnMap(); m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTOR"), ColumnValue::NULLABLE, 3,3,0, @@ -254,8 +239,8 @@ 3,3,0, DataType::VARCHAR); } -// ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSetMetaData::setColumnsMap() +// ----------------------------------------------------------------------------- +void ODatabaseMetaDataResultSetMetaData::setTableNameMap() { m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"), ColumnValue::NULLABLE, @@ -269,10 +254,21 @@ ColumnValue::NO_NULLS, 3,3,0, DataType::VARCHAR); +} +// ----------------------------------------------------------------------------- +void ODatabaseMetaDataResultSetMetaData::setColumnMap() +{ + setTableNameMap(); m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"), ColumnValue::NO_NULLS, 3,3,0, DataType::VARCHAR); +} +// ------------------------------------------------------------------------- +void ODatabaseMetaDataResultSetMetaData::setColumnsMap() +{ + setColumnMap(); + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"), ColumnValue::NO_NULLS, 0,0,0, @@ -333,18 +329,7 @@ // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTablesMap() { - m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"), - ColumnValue::NO_NULLS, - 0,0,0, - DataType::VARCHAR); + setTableNameMap(); m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_TYPE"), ColumnValue::NO_NULLS, 0,0,0, @@ -355,7 +340,7 @@ DataType::VARCHAR); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() +void ODatabaseMetaDataResultSetMetaData::setProcedureNameMap() { m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_CAT"), ColumnValue::NULLABLE, @@ -369,6 +354,11 @@ ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR); +} +// ------------------------------------------------------------------------- +void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() +{ + setProcedureNameMap(); m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"), ColumnValue::NO_NULLS, 0,0,0, @@ -414,22 +404,7 @@ // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() { - m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"), - ColumnValue::NO_NULLS, - 0,0,0, - DataType::VARCHAR); - m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"), - ColumnValue::NO_NULLS, - 0,0,0, - DataType::VARCHAR); + setColumnMap(); m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("KEY_SEQ"), ColumnValue::NO_NULLS, 1,1,0, @@ -442,18 +417,7 @@ // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() { - m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"), - ColumnValue::NO_NULLS, - 0,0,0, - DataType::VARCHAR); + setTableNameMap(); m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NON_UNIQUE"), ColumnValue::NO_NULLS, 1,1,0, @@ -498,18 +462,7 @@ // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() { - m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"), - ColumnValue::NO_NULLS, - 0,0,0, - DataType::VARCHAR); + setTableNameMap(); m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTOR"), ColumnValue::NULLABLE, 0,0,0, @@ -667,18 +620,7 @@ // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setProceduresMap() { - m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_CAT"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_SCHEM"), - ColumnValue::NULLABLE, - 0,0,0, - DataType::VARCHAR); - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_NAME"), - ColumnValue::NO_NULLS, - 0,0,0, - DataType::VARCHAR); + setProcedureNameMap(); m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RESERVED1"), ColumnValue::NULLABLE, 0,0,0, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
