User: rt Date: 2008-01-30 07:50:17+0000 Modified: dba/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
Log: INTEGRATION: CWS dba24d (1.33.58); FILE MERGED 2007/11/21 12:43:01 oj 1.33.58.1: #i68854# impl TypeSettingInfo for Oracle and some clean up File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx?r1=1.33&r2=1.34 Delta lines: +7 -92 -------------------- --- DDatabaseMetaData.cxx 2007-06-05 14:21:06+0000 1.33 +++ DDatabaseMetaData.cxx 2008-01-30 07:50:14+0000 1.34 @@ -105,13 +105,13 @@ { } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException) +Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); + ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo); Reference< XResultSet > xRef = pResult; - pResult->setTypeInfoMap(); + static ODatabaseMetaDataResultSet::ORows aRows; if(aRows.empty()) { @@ -180,19 +180,6 @@ return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumnPrivileges( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/, - const ::rtl::OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); - Reference< XResultSet > xRef = pResult; - pResult->setColumnPrivilegesMap(); - return xRef; -} - -// ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) @@ -276,59 +263,13 @@ } } } - - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); + ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; - pResult->setColumnsMap(); pResult->setRows(aRows); return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getVersionColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); - Reference< XResultSet > xRef = pResult; - pResult->setVersionColumnsMap(); - return xRef; -} -// ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getExportedKeys( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); - Reference< XResultSet > xRef = pResult; - pResult->setExportedKeysMap(); - return xRef; -} -// ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getImportedKeys( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); - Reference< XResultSet > xRef = pResult; - pResult->setImportedKeysMap(); - return xRef; -} -// ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getPrimaryKeys( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); - Reference< XResultSet > xRef = pResult; - pResult->setPrimaryKeysMap(); - return xRef; -} -// ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& table, sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException) @@ -400,38 +341,12 @@ } } - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); + ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eIndexInfo); Reference< XResultSet > xRef = pResult; - pResult->setIndexInfoMap(); pResult->setRows(aRows); return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getBestRowIdentifier( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/, sal_Int32 /*scope*/, - sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); - Reference< XResultSet > xRef = pResult; - pResult->setBestRowIdentifierMap(); - return xRef; -} -// ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getCrossReference( - const Any& /*primaryCatalog*/, const ::rtl::OUString& /*primarySchema*/, - const ::rtl::OUString& /*primaryTable*/, const Any& /*foreignCatalog*/, - const ::rtl::OUString& /*foreignSchema*/, const ::rtl::OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); - Reference< XResultSet > xRef = pResult; - pResult->setCrossReferenceMap(); - return xRef; -} -// ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
