User: obo Date: 2006/07/10 07:22:07 Modified: dba/connectivity/source/drivers/adabas/BIndexes.cxx
Log: INTEGRATION: CWS qiq (1.20.104); FILE MERGED 2006/06/27 14:03:30 fs 1.20.104.2: RESYNC: (1.20-1.21); FILE MERGED 2006/06/16 11:32:30 fs 1.20.104.1: during #i51143#: refactored VCollection: - createEmptyObject now named createDescriptor - cloneObject removed - appendObject now returns the newly created object (previously done via a subsequent call to cloneObject) File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BIndexes.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BIndexes.cxx?r1=1.21&r2=1.22 Delta lines: +52 -64 --------------------- --- BIndexes.cxx 20 Jun 2006 01:09:21 -0000 1.21 +++ BIndexes.cxx 10 Jul 2006 14:22:04 -0000 1.22 @@ -120,27 +120,17 @@ m_pTable->refreshIndexes(); } // ------------------------------------------------------------------------- -Reference< XPropertySet > OIndexes::createEmptyObject() +Reference< XPropertySet > OIndexes::createDescriptor() { return new OAdabasIndex(m_pTable); } // ------------------------------------------------------------------------- -sdbcx::ObjectType OIndexes::cloneObject(const Reference< XPropertySet >& _xDescriptor) -{ - sdbcx::ObjectType xName; - if(!m_pTable->isNew()) - { - xName = OCollection_TYPE::cloneObject(_xDescriptor); - } - return xName; -} -// ------------------------------------------------------------------------- // XAppend -void OIndexes::appendObject( const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); - if(!m_pTable->isNew()) - { + if ( m_pTable->isNew() ) + ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(this)); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE "); ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); @@ -150,9 +140,9 @@ aSql = aSql + ::rtl::OUString::createFromAscii("INDEX "); - if(aName.getLength()) + if(_rForName.getLength()) { - aSql = aSql + aQuote + aName + aQuote + aSql = aSql + aQuote + _rForName + aQuote + ::rtl::OUString::createFromAscii(" ON ") + aQuote + m_pTable->getSchema() + aQuote + sDot + aQuote + m_pTable->getTableName() + aQuote @@ -193,10 +183,8 @@ Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); xStmt->execute(aSql); ::comphelper::disposeComponent(xStmt); - } - else - ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(this)); + return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
