User: obo Date: 2006/07/10 07:28:30 Modified: dba/connectivity/source/drivers/hsqldb/HTables.cxx
Log: INTEGRATION: CWS qiq (1.4.104); FILE MERGED 2006/06/27 14:27:31 fs 1.4.104.3: RESYNC: (1.4-1.5); FILE MERGED 2006/06/16 11:32:33 fs 1.4.104.2: 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) 2006/05/23 13:27:03 fs 1.4.104.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143# File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HTables.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HTables.cxx?r1=1.5&r2=1.6 Delta lines: +6 -9 ------------------- --- HTables.cxx 20 Jun 2006 01:30:42 -0000 1.5 +++ HTables.cxx 10 Jul 2006 14:28:27 -0000 1.6 @@ -152,19 +152,16 @@ OCollection::disposing(); } // ------------------------------------------------------------------------- -Reference< XPropertySet > OTables::createEmptyObject() +Reference< XPropertySet > OTables::createDescriptor() { return new OHSQLTable(this,static_cast<OHCatalog&>(m_rParent).getConnection()); } // ------------------------------------------------------------------------- // XAppend -void OTables::appendObject( const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); - if(!aName.getLength()) - ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(this)); - createTable(descriptor); + return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop @@ -189,8 +186,8 @@ else aSql += ::rtl::OUString::createFromAscii("TABLE "); - ::rtl::OUString sComposedName; - ::dbtools::composeTableName(m_xMetaData,sCatalog,sSchema,sTable,sComposedName,sal_True,::dbtools::eInDataManipulation); + ::rtl::OUString sComposedName( + ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) ); aSql += sComposedName; Reference< XStatement > xStmt = xConnection->createStatement( ); if ( xStmt.is() ) @@ -235,7 +232,7 @@ ::rtl::OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject) { OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!"); - return ::dbtools::composeTableName(m_xMetaData,_xObject,sal_False,::dbtools::eInDataManipulation); + return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false ); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
