summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/adabas
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/adabas')
-rw-r--r--connectivity/source/drivers/adabas/BColumns.cxx40
-rw-r--r--connectivity/source/drivers/adabas/BGroup.cxx8
-rw-r--r--connectivity/source/drivers/adabas/BGroups.cxx12
-rw-r--r--connectivity/source/drivers/adabas/BIndexes.cxx18
-rw-r--r--connectivity/source/drivers/adabas/BKeys.cxx27
-rw-r--r--connectivity/source/drivers/adabas/BTable.cxx74
-rw-r--r--connectivity/source/drivers/adabas/BUser.cxx10
-rw-r--r--connectivity/source/drivers/adabas/BUsers.cxx27
-rw-r--r--connectivity/source/drivers/adabas/BViews.cxx20
9 files changed, 95 insertions, 141 deletions
diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index f42e87ac4db1..048d80f4971f 100644
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BColumns.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 14:07:19 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -83,10 +83,6 @@
#ifndef _CONNECTIVITY_ADABAS_TABLE_HXX_
#include "adabas/BTable.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
using namespace connectivity::adabas;
@@ -155,37 +151,37 @@ void SAL_CALL OColumns::appendByDescriptor( const Reference< XPropertySet >& des
aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getTableName() + aQuote;
aSql = aSql + ::rtl::OUString::createFromAscii(" ADD ");
- aSql = aSql + aQuote + getString(descriptor->getPropertyValue(PROPERTY_NAME)) + aQuote;
+ aSql = aSql + aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
aSql = aSql + ::rtl::OUString::createFromAscii(" ");
- Any aTypeName = descriptor->getPropertyValue(PROPERTY_TYPENAME);
+ Any aTypeName = descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
if(aTypeName.hasValue() && getString(aTypeName).getLength())
aSql = aSql + getString(aTypeName);
else
aSql = aSql + getTypeString(descriptor) + ::rtl::OUString::createFromAscii(" ");
- // aSql = aSql + getString(descriptor->getPropertyValue(PROPERTY_TYPENAME));
+ // aSql = aSql + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
- switch(getINT32(descriptor->getPropertyValue(PROPERTY_TYPE)))
+ switch(getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
{
- case DataType::CHAR:
- case DataType::VARCHAR:
+ case DataType::CHAR:
+ case DataType::VARCHAR:
aSql = aSql + ::rtl::OUString::createFromAscii("(")
- + ::rtl::OUString::valueOf(getINT32(descriptor->getPropertyValue(PROPERTY_PRECISION)))
+ + ::rtl::OUString::valueOf(getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))))
+ ::rtl::OUString::createFromAscii(")");
break;
- case DataType::DECIMAL:
- case DataType::NUMERIC:
+ case DataType::DECIMAL:
+ case DataType::NUMERIC:
aSql = aSql + ::rtl::OUString::createFromAscii("(")
- + ::rtl::OUString::valueOf(getINT32(descriptor->getPropertyValue(PROPERTY_PRECISION)))
+ + ::rtl::OUString::valueOf(getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))))
+ ::rtl::OUString::createFromAscii(",")
- + ::rtl::OUString::valueOf(getINT32(descriptor->getPropertyValue(PROPERTY_SCALE)))
+ + ::rtl::OUString::valueOf(getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))))
+ ::rtl::OUString::createFromAscii(")");
break;
}
- ::rtl::OUString aDefault = getString(descriptor->getPropertyValue(PROPERTY_DEFAULTVALUE));
- if(getINT32(descriptor->getPropertyValue(PROPERTY_ISNULLABLE)) == ColumnValue::NO_NULLS)
+ ::rtl::OUString aDefault = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
+ if(getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS)
{
aSql = aSql + ::rtl::OUString::createFromAscii(" NOT NULL");
if(aDefault.getLength())
@@ -194,7 +190,7 @@ void SAL_CALL OColumns::appendByDescriptor( const Reference< XPropertySet >& des
else if(aDefault.getLength())
aSql = aSql + ::rtl::OUString::createFromAscii(" DEFAULT ") + aDefault;
- Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
+ Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
xStmt->execute(aSql);
}
OCollection_TYPE::appendByDescriptor(descriptor);
@@ -214,7 +210,7 @@ void SAL_CALL OColumns::dropByName( const ::rtl::OUString& elementName ) throw(S
aSql = aSql + ::rtl::OUString::createFromAscii(" DROP ");
aSql = aSql + aQuote + elementName + aQuote;
- Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
+ Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
xStmt->execute(aSql);
}
@@ -237,7 +233,7 @@ void SAL_CALL OColumns::dropByIndex( sal_Int32 index ) throw(SQLException, Index
aSql = aSql + ::rtl::OUString::createFromAscii(" DROP ");
aSql = aSql + aQuote + m_aElements[index]->first + aQuote;
- Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
+ Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
xStmt->execute(aSql);
}
OCollection_TYPE::dropByIndex(index);
diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx
index 4a4db5af27cb..9fd02f248fd5 100644
--- a/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/connectivity/source/drivers/adabas/BGroup.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BGroup.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-05-04 09:58:40 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,10 +74,6 @@
#ifndef _CONNECTIVITY_ADABAS_BCONNECTION_HXX_
#include "adabas/BConnection.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx
index 9d5853cce9a4..a956813c6809 100644
--- a/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/connectivity/source/drivers/adabas/BGroups.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BGroups.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 14:07:19 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,10 +77,6 @@
#ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
#include "sdbcx/IRefreshable.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
@@ -114,7 +110,7 @@ Reference< XPropertySet > OGroups::createEmptyObject()
void SAL_CALL OGroups::appendByDescriptor( const Reference< XPropertySet >& descriptor ) throw(SQLException, ElementExistException, RuntimeException)
{
::osl::MutexGuard aGuard(m_rMutex);
- ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
+ ::rtl::OUString aName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
ObjectMap::iterator aIter = m_aNameMap.find(aName);
if( aIter != m_aNameMap.end())
throw ElementExistException(aName,*this);
@@ -123,7 +119,7 @@ void SAL_CALL OGroups::appendByDescriptor( const Reference< XPropertySet >& desc
::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE USERGROUP ");
::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( );
- aSql = aSql + aQuote + getString(descriptor->getPropertyValue(PROPERTY_NAME)) + aQuote;
+ aSql = aSql + aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
Reference< XStatement > xStmt = m_pConnection->createStatement( );
xStmt->execute(aSql);
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index 14dbc0dc764a..b5f153e6034d 100644
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BIndexes.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 14:07:19 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,10 +79,6 @@
#ifndef _COM_SUN_STAR_SDBC_INDEXTYPE_HPP_
#include <com/sun/star/sdbc/IndexType.hpp>
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
#endif
@@ -147,7 +143,7 @@ void SAL_CALL OIndexes::appendByDescriptor( const Reference< XPropertySet >& des
{
::osl::MutexGuard aGuard(m_rMutex);
- ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
+ ::rtl::OUString aName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
ObjectMap::iterator aIter = m_aNameMap.find(aName);
if( aIter != m_aNameMap.end())
throw ElementExistException(aName,*this);
@@ -158,7 +154,7 @@ void SAL_CALL OIndexes::appendByDescriptor( const Reference< XPropertySet >& des
::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString aDot = ::rtl::OUString::createFromAscii(".");
- if(getBOOL(descriptor->getPropertyValue(PROPERTY_ISUNIQUE)))
+ if(getBOOL(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))))
aSql = aSql + ::rtl::OUString::createFromAscii("UNIQUE ");
aSql = aSql + ::rtl::OUString::createFromAscii("INDEX ");
@@ -177,8 +173,8 @@ void SAL_CALL OIndexes::appendByDescriptor( const Reference< XPropertySet >& des
for(sal_Int32 i=0;i<xColumns->getCount();++i)
{
xColumns->getByIndex(i) >>= xColProp;
- aSql = aSql + aQuote + getString(xColProp->getPropertyValue(PROPERTY_NAME)) + aQuote;
- aSql = aSql + (getBOOL(xColProp->getPropertyValue(PROPERTY_ISASCENDING))
+ aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
+ aSql = aSql + (getBOOL(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING)))
?
::rtl::OUString::createFromAscii(" ASC")
:
@@ -199,7 +195,7 @@ void SAL_CALL OIndexes::appendByDescriptor( const Reference< XPropertySet >& des
xColumns->getByIndex(0) >>= xColProp;
- aSql = aSql + aDot + aQuote + getString(xColProp->getPropertyValue(PROPERTY_NAME)) + aQuote;
+ aSql = aSql + aDot + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
}
Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index c3ff6c947a59..67e436c99a17 100644
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BKeys.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 14:07:19 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,10 +80,7 @@
#ifndef _COM_SUN_STAR_SDBC_KEYRULE_HPP_
#include <com/sun/star/sdbc/KeyRule.hpp>
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
+
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -174,16 +171,16 @@ Reference< XPropertySet > OKeys::createEmptyObject()
void SAL_CALL OKeys::appendByDescriptor( const Reference< XPropertySet >& descriptor ) throw(SQLException, ElementExistException, RuntimeException)
{
::osl::MutexGuard aGuard(m_rMutex);
- ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
+ ::rtl::OUString aName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
ObjectMap::iterator aIter = m_aNameMap.find(aName);
if( aIter != m_aNameMap.end())
{
- if(aName.getLength() || getINT32(descriptor->getPropertyValue(PROPERTY_TYPE)) == KeyType::PRIMARY) // check if this isn't a primary key
+ if(aName.getLength() || getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == KeyType::PRIMARY) // check if this isn't a primary key
throw ElementExistException(aName,*this);
}
if(!m_pTable->isNew())
{
- sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(PROPERTY_TYPE));
+ sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE ");
::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( );
@@ -208,16 +205,16 @@ void SAL_CALL OKeys::appendByDescriptor( const Reference< XPropertySet >& descri
{
Reference< XPropertySet > xColProp;
xColumns->getByIndex(i) >>= xColProp;
- aSql = aSql + aQuote + getString(xColProp->getPropertyValue(PROPERTY_NAME)) + aQuote
+ aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
+ ::rtl::OUString::createFromAscii(",");
}
aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
if(nKeyType == KeyType::FOREIGN)
{
- sal_Int32 nDeleteRule = getINT32(descriptor->getPropertyValue(PROPERTY_DELETERULE));
+ sal_Int32 nDeleteRule = getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE)));
- ::rtl::OUString aName,aSchema,aRefTable = getString(descriptor->getPropertyValue(PROPERTY_REFERENCEDTABLE));
+ ::rtl::OUString aName,aSchema,aRefTable = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
sal_Int32 nLen = aRefTable.indexOf('.');
aSchema = aRefTable.copy(0,nLen);
aName = aRefTable.copy(nLen+1);
@@ -229,7 +226,7 @@ void SAL_CALL OKeys::appendByDescriptor( const Reference< XPropertySet >& descri
{
Reference< XPropertySet > xColProp;
xColumns->getByIndex(i) >>= xColProp;
- aSql = aSql + aQuote + getString(xColProp->getPropertyValue(PROPERTY_RELATEDCOLUMN)) + aQuote
+ aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN))) + aQuote
+ ::rtl::OUString::createFromAscii(",");
}
aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
@@ -268,7 +265,7 @@ void SAL_CALL OKeys::appendByDescriptor( const Reference< XPropertySet >& descri
ObjectMap::iterator aIter = m_aNameMap.find(sName);
if( aIter == m_aNameMap.end()) // this name wasn't inserted yet so it must be te new one
{
- descriptor->setPropertyValue(PROPERTY_NAME,makeAny(sName));
+ descriptor->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(sName));
break;
}
}
@@ -293,7 +290,7 @@ void SAL_CALL OKeys::dropByName( const ::rtl::OUString& elementName ) throw(SQLE
::rtl::OUString aDot = ::rtl::OUString::createFromAscii(".");
Reference<XPropertySet> xKey(aIter->second,UNO_QUERY);
- sal_Int32 nKeyType = getINT32(xKey->getPropertyValue(PROPERTY_TYPE));
+ sal_Int32 nKeyType = getINT32(xKey->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
aSql += aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getTableName() + aQuote;
if(nKeyType == KeyType::PRIMARY)
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index ed921cf5e3ef..3fb3e38609d3 100644
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BTable.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: oj $ $Date: 2001-05-04 09:58:40 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,10 +95,6 @@
#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
#endif
@@ -197,8 +193,9 @@ void OAdabasTable::refreshKeys()
refreshForgeinKeys(aVector);
}
if(m_pKeys)
- delete m_pKeys;
- m_pKeys = new OKeys(this,m_aMutex,aVector);
+ m_pKeys->reFill(aVector);
+ else
+ m_pKeys = new OKeys(this,m_aMutex,aVector);
}
// -------------------------------------------------------------------------
void OAdabasTable::refreshIndexes()
@@ -233,8 +230,9 @@ void OAdabasTable::refreshIndexes()
}
if(m_pIndexes)
- delete m_pIndexes;
- m_pIndexes = new OIndexes(this,m_aMutex,aVector);
+ m_pIndexes->reFill(aVector);
+ else
+ m_pIndexes = new OIndexes(this,m_aMutex,aVector);
}
//--------------------------------------------------------------------------
Sequence< sal_Int8 > OAdabasTable::getUnoTunnelImplementationId()
@@ -277,31 +275,31 @@ sal_Bool OAdabasTable::create() throw(SQLException, RuntimeException)
for(sal_Int32 i=0;i<nCount;++i)
{
::cppu::extractInterface(xProp,m_pColumns->getByIndex(i));
- aSql += aQuote + getString(xProp->getPropertyValue(PROPERTY_NAME)) + aQuote
- + getString(xProp->getPropertyValue(PROPERTY_TYPENAME));
+ aSql += aQuote + getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
+ + getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
// add type definition
- switch(getINT32(xProp->getPropertyValue(PROPERTY_TYPE)))
+ switch(getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
{
case DataType::CHAR:
case DataType::VARCHAR:
aSql += ::rtl::OUString::createFromAscii("(")
- + ::rtl::OUString::valueOf(getINT32(xProp->getPropertyValue(PROPERTY_TYPE)))
+ + ::rtl::OUString::valueOf(getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
+ ::rtl::OUString::createFromAscii(")");
break;
case DataType::DECIMAL:
case DataType::NUMERIC:
aSql += ::rtl::OUString::createFromAscii("(")
- + ::rtl::OUString::valueOf(getINT32(xProp->getPropertyValue(PROPERTY_TYPE)))
+ + ::rtl::OUString::valueOf(getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
+ ::rtl::OUString::createFromAscii(",")
- + ::rtl::OUString::valueOf(getINT32(xProp->getPropertyValue(PROPERTY_SCALE)))
+ + ::rtl::OUString::valueOf(getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))))
+ ::rtl::OUString::createFromAscii(")");
break;
}
- ::rtl::OUString aDefault = getString(xProp->getPropertyValue(PROPERTY_DEFAULTVALUE));
- if(getINT32(xProp->getPropertyValue(PROPERTY_ISNULLABLE)) == ColumnValue::NO_NULLS)
+ ::rtl::OUString aDefault = getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
+ if(getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS)
{
aSql += ::rtl::OUString::createFromAscii(" NOT NULL");
if(aDefault.getLength())
@@ -321,7 +319,7 @@ sal_Bool OAdabasTable::create() throw(SQLException, RuntimeException)
::cppu::extractInterface(xProp,m_pKeys->getByIndex(i));
Reference< XColumnsSupplier > xKey(xProp,UNO_QUERY);
Reference< ::com::sun::star::container::XIndexAccess > xCols(xKey->getColumns(),UNO_QUERY);
- switch(getINT32(xProp->getPropertyValue(PROPERTY_TYPE)))
+ switch(getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
{
case KeyType::PRIMARY:
{
@@ -331,7 +329,7 @@ sal_Bool OAdabasTable::create() throw(SQLException, RuntimeException)
for(sal_Int32 i=0;i<nCols;++i)
{
::cppu::extractInterface(xProp,xCols->getByIndex(i));
- aSql += aQuote + getString(xProp->getPropertyValue(PROPERTY_NAME)) + aQuote;
+ aSql += aQuote + getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
aSql += aComma;
}
if(nCols)
@@ -345,7 +343,7 @@ sal_Bool OAdabasTable::create() throw(SQLException, RuntimeException)
for(sal_Int32 i=0;i<nCols;++i)
{
::cppu::extractInterface(xProp,xCols->getByIndex(i));
- aSql += aQuote + getString(xProp->getPropertyValue(PROPERTY_NAME)) + aQuote;
+ aSql += aQuote + getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
aSql += aComma;
}
if(nCols)
@@ -357,9 +355,9 @@ sal_Bool OAdabasTable::create() throw(SQLException, RuntimeException)
if(nCols)
{
aSql += ::rtl::OUString::createFromAscii(" FOREIGN KEY( ");
- ::rtl::OUString aKeyName = getString(xProp->getPropertyValue(PROPERTY_NAME));
- ::rtl::OUString aRefTableName = getString(xProp->getPropertyValue(PROPERTY_REFERENCEDTABLE));
- sal_Int32 nDeleteRule = getINT32(xProp->getPropertyValue(PROPERTY_DELETERULE));
+ ::rtl::OUString aKeyName = getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
+ ::rtl::OUString aRefTableName = getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
+ sal_Int32 nDeleteRule = getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE)));
if(aKeyName.getLength())
{
aSql += aQuote + aKeyName + aQuote;
@@ -369,7 +367,7 @@ sal_Bool OAdabasTable::create() throw(SQLException, RuntimeException)
for(sal_Int32 i=0;i<nCols;++i)
{
::cppu::extractInterface(xProp,xCols->getByIndex(i));
- aSql += aQuote + getString(xProp->getPropertyValue(PROPERTY_NAME)) + aQuote;
+ aSql += aQuote + getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
aSql += aComma;
}
aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
@@ -456,7 +454,7 @@ void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, c
if(!isNew())
{
- if(getString(descriptor->getPropertyValue(PROPERTY_NAME)) != colName)
+ if(getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) != colName)
throw SQLException(::rtl::OUString::createFromAscii("Not supported by this driver!"),*this,::rtl::OUString::createFromAscii("S1000"),0,Any() );
Reference< XStatement > xStmt = m_pConnection->createStatement();
@@ -469,22 +467,22 @@ void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, c
m_pColumns->getByName(colName) >>= xProp;
// first check the types
sal_Int32 nOldType = 0,nNewType = 0;
- xProp->getPropertyValue(PROPERTY_TYPE) >>= nOldType;
- descriptor->getPropertyValue(PROPERTY_TYPE) >>= nNewType;
+ xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType;
+ descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType;
if(nOldType != nNewType)
alterColumnType(nNewType,colName,descriptor);
// second: check the "is nullable" value
sal_Int32 nOldNullable = 0,nNewNullable = 0;
- xProp->getPropertyValue(PROPERTY_ISNULLABLE) >>= nOldNullable;
- descriptor->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNewNullable;
+ xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable;
+ descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable;
if(nNewNullable != nOldNullable)
alterNotNullValue(nNewNullable,colName);
// third: check the default values
::rtl::OUString sNewDefault,sOldDefault;
- xProp->getPropertyValue(PROPERTY_DEFAULTVALUE) >>= sOldDefault;
- descriptor->getPropertyValue(PROPERTY_DEFAULTVALUE) >>= sNewDefault;
+ xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault;
+ descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault;
if(sOldDefault.getLength())
{
@@ -533,14 +531,14 @@ void SAL_CALL OAdabasTable::alterColumnByIndex( sal_Int32 index, const Reference
Reference< XPropertySet > xOld;
if(::cppu::extractInterface(xOld,m_pColumns->getByIndex(index)) && xOld.is())
- alterColumnByName(getString(xOld->getPropertyValue(PROPERTY_NAME)),descriptor);
+ alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor);
}
// -------------------------------------------------------------------------
::rtl::OUString connectivity::adabas::getTypeString(const Reference< ::com::sun::star::beans::XPropertySet >& xColProp)
{
::rtl::OUString aValue;
- switch(getINT32(xColProp->getPropertyValue(PROPERTY_TYPE)))
+ switch(getINT32(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
{
case DataType::BIT:
aValue = ::rtl::OUString::createFromAscii("BOOLEAN");
@@ -628,23 +626,23 @@ void OAdabasTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rC
+ ::rtl::OUString::createFromAscii(" COLUMN ")
+ aQuote + _rColName + aQuote;
aSql += ::rtl::OUString::createFromAscii(" ")
- + getString(_xDescriptor->getPropertyValue(PROPERTY_TYPENAME));
+ + getString(_xDescriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
switch(nNewType)
{
case DataType::CHAR:
case DataType::VARCHAR:
aSql += ::rtl::OUString::createFromAscii("(")
- + ::rtl::OUString::valueOf(getINT32(_xDescriptor->getPropertyValue(PROPERTY_TYPE)))
+ + ::rtl::OUString::valueOf(getINT32(_xDescriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
+ ::rtl::OUString::createFromAscii(")");
break;
case DataType::DECIMAL:
case DataType::NUMERIC:
aSql += ::rtl::OUString::createFromAscii("(")
- + ::rtl::OUString::valueOf(getINT32(_xDescriptor->getPropertyValue(PROPERTY_TYPE)))
+ + ::rtl::OUString::valueOf(getINT32(_xDescriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
+ ::rtl::OUString::createFromAscii(",")
- + ::rtl::OUString::valueOf(getINT32(_xDescriptor->getPropertyValue(PROPERTY_SCALE)))
+ + ::rtl::OUString::valueOf(getINT32(_xDescriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))))
+ ::rtl::OUString::createFromAscii(")");
break;
}
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index b943ea35bc12..f6cdcc7b4462 100644
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BUser.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2001-05-04 09:58:40 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,10 +74,6 @@
#ifndef _CONNECTIVITY_ADABAS_BCONNECTION_HXX_
#include "adabas/BConnection.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
@@ -148,7 +144,7 @@ typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
void OUserExtend::construct()
{
OUser_TYPEDEF::construct();
- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index ca0c29de09ea..724f2a4cc5a8 100644
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BUsers.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 14:07:19 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,23 +77,6 @@
#ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
#include "connectivity/sdbcx/IRefreshable.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
-
-// define the properties of this lib
-// this file includes the properties for this dll
-namespace connectivity
-{
- namespace adabas
- {
-#ifndef CONNECTIVITY_USTRINGDESCRIPTION_IMPL_HXX
-#include "UStringDescription_Impl.hxx"
-#endif
- }
-}
-
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
@@ -126,7 +109,7 @@ Reference< XPropertySet > OUsers::createEmptyObject()
void SAL_CALL OUsers::appendByDescriptor( const Reference< XPropertySet >& descriptor ) throw(SQLException, ElementExistException, RuntimeException)
{
::osl::MutexGuard aGuard(m_rMutex);
- ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
+ ::rtl::OUString aName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
ObjectMap::iterator aIter = m_aNameMap.find(aName);
if( aIter != m_aNameMap.end())
throw ElementExistException(aName,*this);
@@ -134,9 +117,9 @@ void SAL_CALL OUsers::appendByDescriptor( const Reference< XPropertySet >& descr
::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE USER ");
::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( );
- aSql = aSql + aQuote + getString(descriptor->getPropertyValue(PROPERTY_NAME)) + aQuote
+ aSql = aSql + aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
+ ::rtl::OUString::createFromAscii(" PASSWORD ")
- + getString(descriptor->getPropertyValue(PROPERTY_PASSWORD));
+ + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)));
Reference< XStatement > xStmt = m_pConnection->createStatement( );
xStmt->execute(aSql);
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index 51560af74b84..98f2b4a3fdaa 100644
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BViews.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-04-24 14:13:16 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,10 +84,6 @@
#ifndef _CONNECTIVITY_ADABAS_BCONNECTION_HXX_
#include "adabas/BConnection.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE adabas
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
#endif
@@ -179,7 +175,7 @@ Reference< XPropertySet > OViews::createEmptyObject()
void SAL_CALL OViews::appendByDescriptor( const Reference< XPropertySet >& descriptor ) throw(SQLException, ElementExistException, RuntimeException)
{
::osl::MutexGuard aGuard(m_rMutex);
- ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
+ ::rtl::OUString aName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
ObjectMap::iterator aIter = m_aNameMap.find(aName);
if( aIter != m_aNameMap.end())
throw ElementExistException(aName,*this);
@@ -244,15 +240,15 @@ void OViews::createView( const Reference< XPropertySet >& descriptor )
::rtl::OUString aQuote = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString aDot = ::rtl::OUString::createFromAscii("."),sSchema,sCommand;
- descriptor->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
+ descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema;
if(sSchema.getLength())
aSql += ::dbtools::quoteName(aQuote, sSchema) + aDot;
else
- descriptor->setPropertyValue(PROPERTY_SCHEMANAME,makeAny(sSchema = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getUserName()));
+ descriptor->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),makeAny(sSchema = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getUserName()));
- aSql += ::dbtools::quoteName(aQuote, getString(descriptor->getPropertyValue(PROPERTY_NAME)))
+ aSql += ::dbtools::quoteName(aQuote, getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))))
+ ::rtl::OUString::createFromAscii(" AS ");
- descriptor->getPropertyValue(PROPERTY_COMMAND) >>= sCommand;
+ descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand;
aSql += sCommand;
OAdabasConnection* pConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection();
@@ -265,7 +261,7 @@ void OViews::createView( const Reference< XPropertySet >& descriptor )
{
::rtl::OUString sName = sSchema;
sName += aDot;
- sName += getString(descriptor->getPropertyValue(PROPERTY_NAME));
+ sName += getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
pTables->appendNew(sName);
}
}
generated by cgit (git 2.34.1) at 2025-05-04 05:22:13 +0000