User: obo Date: 2006/07/10 07:21:22 Modified: dba/connectivity/source/drivers/adabas/BColumns.cxx
Log: INTEGRATION: CWS qiq (1.17.104); FILE MERGED 2006/06/27 14:02:22 fs 1.17.104.2: RESYNC: (1.17-1.18); FILE MERGED 2006/06/16 11:32:29 fs 1.17.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]: BColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BColumns.cxx?r1=1.18&r2=1.19 Delta lines: +29 -39 --------------------- --- BColumns.cxx 20 Jun 2006 01:08:02 -0000 1.18 +++ BColumns.cxx 10 Jul 2006 14:21:19 -0000 1.19 @@ -128,27 +128,18 @@ m_pTable->refreshColumns(); } // ------------------------------------------------------------------------- -Reference< XPropertySet > OColumns::createEmptyObject() +Reference< XPropertySet > OColumns::createDescriptor() { return new OColumn(sal_True); } -// ----------------------------------------------------------------------------- -sdbcx::ObjectType OColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) -{ - sdbcx::ObjectType xProp = new OColumn(sal_True); - ::comphelper::copyProperties(_xDescriptor,xProp); - return xProp; -} // ------------------------------------------------------------------------- // XAppend -void OColumns::appendObject( const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_rMutex); - OSL_ENSURE(m_pTable,"OColumns::appendByDescriptor: Table is null!"); - OSL_ENSURE(descriptor.is(),"OColumns::appendByDescriptor: descriptor is null!"); + if ( m_pTable->isNew() ) + return cloneDescriptor( descriptor ); - if(descriptor.is() && !m_pTable->isNew()) - { ::rtl::OUString aSql(RTL_CONSTASCII_USTRINGPARAM("ALTER TABLE ")); ::rtl::OUString sQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); @@ -156,11 +147,9 @@ m_pTable->beginTransAction(); try { - ::rtl::OUString sColumnName; - descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sColumnName; aSql += ::dbtools::quoteName(sQuote,m_pTable->getSchema()) + sDot + ::dbtools::quoteName(sQuote,m_pTable->getTableName()); aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ADD (")); - aSql += ::dbtools::quoteName(sQuote,sColumnName); + aSql += ::dbtools::quoteName(sQuote,_rForName); aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); aSql += OTables::getColumnSqlType(descriptor); aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" )")); @@ -169,7 +158,7 @@ xStmt->execute(aSql); ::comphelper::disposeComponent(xStmt); - m_pTable->alterNotNullValue(getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))),sColumnName); + m_pTable->alterNotNullValue(getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))),_rForName); } catch(const Exception&) { @@ -177,7 +166,8 @@ throw; } m_pTable->endTransAction(); - } + + return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
