diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:28:14 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:28:14 +0000 |
| commit | 49dff040bbfaf3ebef47749f43364515ba707f4a (patch) | |
| tree | 6660c39c6529bcb9385a8e294514b917f69a5173 /connectivity | |
| parent | 13c574bf018d8364695ac4bb39f63cd014afc7fd (diff) | |
INTEGRATION: CWS qiq (1.7.96); FILE MERGED
2006/06/27 14:27:23 fs 1.7.96.2: RESYNC: (1.7-1.8); FILE MERGED
2006/05/23 13:27:03 fs 1.7.96.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143#
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HTable.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 61f6bd04a69a..e5d5729aa8e0 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -4,9 +4,9 @@ * * $RCSfile: HTable.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2006-06-20 01:30:28 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:28:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -358,8 +358,7 @@ void OHSQLTable::dropDefaultValue(const ::rtl::OUString& _rColName) ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString sComposedName; - ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sComposedName,sal_True,::dbtools::eInTableDefinitions); + ::rtl::OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) ); sSql += sComposedName; return sSql; @@ -426,12 +425,11 @@ void SAL_CALL OHSQLTable::rename( const ::rtl::OUString& newName ) throw(SQLExce ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedName; - ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sComposedName,sal_True,::dbtools::eInDataManipulation); + ::rtl::OUString sComposedName( + ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInDataManipulation ) ); sSql += sComposedName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" RENAME TO ")); - ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sComposedName,sal_True,::dbtools::eInDataManipulation); - sSql += sComposedName; + sSql += ::dbtools::composeTableName( getMetaData(), sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ); executeStatement(sSql); |