summaryrefslogtreecommitdiff
path: root/dbaccess/source/core/api
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/core/api')
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx2
-rw-r--r--dbaccess/source/core/api/FilteredContainer.cxx4
-rw-r--r--dbaccess/source/core/api/KeySet.cxx10
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx8
-rw-r--r--dbaccess/source/core/api/RowSet.cxx6
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx12
-rw-r--r--dbaccess/source/core/api/definitioncolumn.cxx2
-rw-r--r--dbaccess/source/core/api/tablecontainer.cxx4
-rw-r--r--dbaccess/source/core/api/viewcontainer.cxx6
9 files changed, 27 insertions, 27 deletions
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 8853a653a03c..5618df02005c 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -144,7 +144,7 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) throw(SQL
,comphelper::getString(_xTable->getPropertyValue(PROPERTY_SCHEMANAME))
,comphelper::getString(_xTable->getPropertyValue(PROPERTY_NAME))
,true
- ,::dbtools::eInDataManipulation);
+ ,::dbtools::EComposeRule::InDataManipulation);
}
}
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 4dad392d6ee4..768f600f064b 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -131,7 +131,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
_io_tableInfo.sComposedName = OptionalString(
composeTableName( _metaData, *_io_tableInfo.sCatalog, *_io_tableInfo.sSchema, *_io_tableInfo.sName,
- false, ::dbtools::eInDataManipulation )
+ false, ::dbtools::EComposeRule::InDataManipulation )
);
}
}
@@ -405,7 +405,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject)
{
OSL_ENSURE( _xObject.is(), "OFilteredContainer::getNameForObject: Object is NULL!" );
- return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false );
+ return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::EComposeRule::InDataManipulation, false, false, false );
}
// multiple to obtain all tables from XDatabaseMetaData::getTables, via passing a particular
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 8aafd7eb76ab..12e74c4dfbf5 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -190,7 +190,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
xTableProp->getPropertyValue( PROPERTY_CATALOGNAME )>>= sCatalog;
xTableProp->getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema;
xTableProp->getPropertyValue( PROPERTY_NAME ) >>= sTable;
- sUpdateTableName = dbtools::composeTableName( i_xMeta, sCatalog, sSchema, sTable, false, ::dbtools::eInDataManipulation );
+ sUpdateTableName = dbtools::composeTableName( i_xMeta, sCatalog, sSchema, sTable, false, ::dbtools::EComposeRule::InDataManipulation );
}
::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sUpdateTableName,(*o_pKeyColumnNames),true);
@@ -265,7 +265,7 @@ OUStringBuffer OKeySet::createKeyFilter()
{
if ( ! aFilter.isEmpty() )
aFilter.append(aAnd);
- appendOneKeyColumnClause(::dbtools::quoteTableName(xMeta, aPosIter->second.sTableName, ::dbtools::eInDataManipulation),
+ appendOneKeyColumnClause(::dbtools::quoteTableName(xMeta, aPosIter->second.sTableName, ::dbtools::EComposeRule::InDataManipulation),
::dbtools::quoteName(aQuote, aPosIter->second.sRealName),
*aIter++,
aFilter);
@@ -275,7 +275,7 @@ OUStringBuffer OKeySet::createKeyFilter()
{
if ( ! aFilter.isEmpty() )
aFilter.append(aAnd);
- appendOneKeyColumnClause(::dbtools::quoteTableName(xMeta, aPosIter->second.sTableName, ::dbtools::eInDataManipulation),
+ appendOneKeyColumnClause(::dbtools::quoteTableName(xMeta, aPosIter->second.sTableName, ::dbtools::EComposeRule::InDataManipulation),
::dbtools::quoteName(aQuote, aPosIter->second.sRealName),
*aIter++,
aFilter);
@@ -311,7 +311,7 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet, const OUStrin
{
connectivity::OSQLTable xSelColSup(xSelectTables->getByName(*pIter),uno::UNO_QUERY);
Reference<XPropertySet> xProp(xSelColSup,uno::UNO_QUERY);
- OUString sSelectTableName = ::dbtools::composeTableName( xMeta, xProp, ::dbtools::eInDataManipulation, false, false, false );
+ OUString sSelectTableName = ::dbtools::composeTableName( xMeta, xProp, ::dbtools::EComposeRule::InDataManipulation, false, false, false );
::dbaccess::getColumnPositions(xQueryColumns, xSelColSup->getColumns()->getElementNames(), sSelectTableName, (*m_pForeignColumnNames), true);
@@ -768,7 +768,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
sMaxStmt = sMaxStmt.replaceAt(sMaxStmt.getLength()-1,1," ");
OUString sStmt = "SELECT " + sMaxStmt + "FROM ";
OUString sCatalog,sSchema,sTable;
- ::dbtools::qualifiedNameComponents(m_xConnection->getMetaData(),m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
+ ::dbtools::qualifiedNameComponents(m_xConnection->getMetaData(),m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::EComposeRule::InDataManipulation);
sStmt += ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
try
{
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 7774fe563b1b..67f6850f8684 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -228,7 +228,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
{
m_bResultSetChanged = m_bResultSetChanged || aResultSetChanged[aSqlIter->first];
OUString sCatalog,sSchema,sTable;
- ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
+ ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::EComposeRule::InDataManipulation);
OUStringBuffer sSql(s_sUPDATE + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) +
s_sSET + aSqlIter->second.toString());
OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first];
@@ -293,7 +293,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
{
m_bResultSetChanged = m_bResultSetChanged || aResultSetChanged[aSqlIter->first];
OUString sCatalog,sSchema,sTable;
- ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
+ ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::EComposeRule::InDataManipulation);
OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
OUString sSql(s_sINSERT + sComposedTableName + " ( " + aSqlIter->second.toString() +
s_sVALUES + aParameter[aSqlIter->first].toString() + " )");
@@ -363,7 +363,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne
if ( !rCondition.isEmpty() )
{
OUString sCatalog,sSchema,sTable;
- ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
+ ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::EComposeRule::InDataManipulation);
OUString sSql("DELETE FROM " + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) +
" WHERE " + rCondition.toString() );
executeDelete(_rDeleteRow, sSql, aSqlIter->first);
@@ -585,7 +585,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
if ( !rCondition.isEmpty() )
{
OUString sCatalog,sSchema,sTable;
- ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
+ ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::EComposeRule::InDataManipulation);
OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " +
rCondition.makeStringAndClear());
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index e4a51b828558..3762ec59cbf6 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1686,7 +1686,7 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
OUString aComposedUpdateTableName;
if ( !m_aUpdateTableName.isEmpty() )
- aComposedUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, m_aUpdateTableName, false, ::dbtools::eInDataManipulation );
+ aComposedUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, m_aUpdateTableName, false, ::dbtools::EComposeRule::InDataManipulation );
SAL_INFO("dbaccess", "ORowSet::impl_prepareAndExecute_throw: creating cache" );
if(m_pCache)
@@ -2354,7 +2354,7 @@ bool ORowSet::impl_buildActiveCommand_throw()
{
sCommand = "SELECT * FROM ";
OUString sCatalog, sSchema, sTable;
- ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation );
+ ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::EComposeRule::InDataManipulation );
sCommand += ::dbtools::composeTableNameForSelect( m_xActiveConnection, sCatalog, sSchema, sTable );
}
}
@@ -2386,7 +2386,7 @@ bool ORowSet::impl_buildActiveCommand_throw()
xQuery->getPropertyValue(PROPERTY_UPDATE_SCHEMANAME) >>= aSchema;
xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME) >>= aTable;
if(!aTable.isEmpty())
- m_aUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), aCatalog, aSchema, aTable, false, ::dbtools::eInDataManipulation );
+ m_aUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), aCatalog, aSchema, aTable, false, ::dbtools::EComposeRule::InDataManipulation );
}
}
else
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index ec4ae3ece64c..f0de55ba9b75 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -488,8 +488,8 @@ OUString OSingleSelectQueryComposer::impl_getColumnRealName_throw(const Referenc
if(sTableName.indexOf('.') != -1)
{
OUString aCatlog,aSchema,aTable;
- ::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::eInDataManipulation);
- sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, true, ::dbtools::eInDataManipulation );
+ ::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::EComposeRule::InDataManipulation);
+ sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation );
}
else if (!sTableName.isEmpty())
sTableName = ::dbtools::quoteName(aQuote,sTableName);
@@ -1305,7 +1305,7 @@ OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet
}
else
{
- aComposedName = ::dbtools::composeTableName( m_xMetaData, aCatalog, aSchema, aTable, false, ::dbtools::eInDataManipulation );
+ aComposedName = ::dbtools::composeTableName( m_xMetaData, aCatalog, aSchema, aTable, false, ::dbtools::EComposeRule::InDataManipulation );
// Is this the right case for the table name?
// Else, look for it with different case, if applicable.
@@ -1338,7 +1338,7 @@ OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet
}
if(pBegin != pEnd)
{
- sReturn = ::dbtools::composeTableName( m_xMetaData, aCatalog, aSchema, aTable, true, ::dbtools::eInDataManipulation ) + ".";
+ sReturn = ::dbtools::composeTableName( m_xMetaData, aCatalog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation ) + ".";
}
}
return sReturn;
@@ -1591,8 +1591,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
if(sTableName.indexOf('.') != -1)
{
OUString aCatlog,aSchema,aTable;
- ::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::eInDataManipulation);
- sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, true, ::dbtools::eInDataManipulation );
+ ::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::EComposeRule::InDataManipulation);
+ sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation );
}
else
sTableName = ::dbtools::quoteName(aQuote,sTableName);
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index d6505031ee94..2cb8693976f2 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -237,7 +237,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const
return nullptr;
OUString sComposedTableName = ::dbtools::composeTableName(
- _rxConnection->getMetaData(), sCatalog, sSchema, sTable, false, ::dbtools::eComplete );
+ _rxConnection->getMetaData(), sCatalog, sSchema, sTable, false, ::dbtools::EComposeRule::Complete );
// retrieve the table in question
Reference< XTablesSupplier > xSuppTables( _rxConnection, UNO_QUERY_THROW );
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index b02baf958d6a..3cbac3de7189 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -188,7 +188,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _r
sCatalog,
sSchema,
sTable,
- ::dbtools::eInDataManipulation);
+ ::dbtools::EComposeRule::InDataManipulation);
Any aCatalog;
if(!sCatalog.isEmpty())
aCatalog <<= sCatalog;
@@ -367,7 +367,7 @@ void OTableContainer::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
xTable->getPropertyValue(PROPERTY_NAME) >>= sTable;
- sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, true, ::dbtools::eInTableDefinitions );
+ sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, true, ::dbtools::EComposeRule::InTableDefinitions );
OUString sType;
xTable->getPropertyValue(PROPERTY_TYPE) >>= sType;
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index f17f8d7df909..0832b2b9f395 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -91,7 +91,7 @@ ObjectType OViewContainer::createObject(const OUString& _rName)
sCatalog,
sSchema,
sTable,
- ::dbtools::eInDataManipulation);
+ ::dbtools::EComposeRule::InDataManipulation);
return new View(m_xConnection,
isCaseSensitive(),
sCatalog,
@@ -136,7 +136,7 @@ ObjectType OViewContainer::appendObject( const OUString& _rForName, const Refere
}
else
{
- OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true );
+ OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::EComposeRule::InTableDefinitions, false, false, true );
if(sComposedName.isEmpty())
::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this)));
@@ -181,7 +181,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
xTable->getPropertyValue(PROPERTY_NAME) >>= sTable;
- sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, true, ::dbtools::eInTableDefinitions );
+ sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, true, ::dbtools::EComposeRule::InTableDefinitions );
}
if(sComposedName.isEmpty())