User: rt Date: 2007-07-06 06:47:16+0000 Modified: dba/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
Log: INTEGRATION: CWS oj14 (1.3.26); FILE MERGED 2006/11/07 08:42:55 oj 1.3.26.3: RESYNC: (1.4-1.5); FILE MERGED 2006/07/04 07:26:46 oj 1.3.26.2: RESYNC: (1.3-1.4); FILE MERGED 2006/03/20 08:19:04 oj 1.3.26.1: 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.5&r2=1.6 Delta lines: +26 -84 --------------------- --- FDatabaseMetaDataResultSetMetaData.cxx 2006-09-17 01:58:24+0000 1.5 +++ FDatabaseMetaDataResultSetMetaData.cxx 2007-07-06 06:47:14+0000 1.6 @@ -224,22 +224,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, @@ -257,8 +242,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, @@ -272,10 +257,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, @@ -336,18 +332,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, @@ -358,7 +343,7 @@ DataType::VARCHAR); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() +void ODatabaseMetaDataResultSetMetaData::setProcedureNameMap() { m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_CAT"), ColumnValue::NULLABLE, @@ -372,6 +357,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, @@ -417,22 +407,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, @@ -445,18 +420,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, @@ -501,18 +465,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, @@ -670,18 +623,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]
