#89430# fixed float and double problems with adabas

10 files changed, 169 insertions, 276 deletions

diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index ac3da71beb60..f639c26ceb79 100644
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BIndexColumns.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-08 14:08:31 $
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:49:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,9 @@
 #ifndef _CONNECTIVITY_ADABAS_TABLE_HXX_
 #include "adabas/BTable.hxx"
 #endif
+#ifndef _CONNECTIVITY_ADABAS_CATALOG_HXX_
+#include "adabas/BCatalog.hxx"
+#endif
 
 using namespace connectivity::adabas;
 using namespace connectivity::sdbcx;
@@ -108,10 +111,10 @@ Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName)
         }
     }
 
-         xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getColumns(Any(),
-        m_pIndex->getTable()->getSchema(),m_pIndex->getTable()->getTableName(),_rName);
+    xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getColumns(Any(),
+            m_pIndex->getTable()->getSchema(),m_pIndex->getTable()->getTableName(),_rName);
 
-        Reference< XNamed > xRet = NULL;
+    Reference< XNamed > xRet = NULL;
     if(xResult.is())
     {
                 Reference< XRow > xRow(xResult,UNO_QUERY);
@@ -119,14 +122,19 @@ Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName)
         {
             if(xRow->getString(4) == _rName)
             {
+                sal_Int32 nType             = xRow->getInt(5);
+                ::rtl::OUString sTypeName   = xRow->getString(6);
+                sal_Int32 nPrec             = xRow->getInt(7);
+                OAdabasCatalog::correctColumnProperties(nPrec,nType,sTypeName);
+
                 OIndexColumn* pRet = new OIndexColumn(bAsc,
                                                     _rName,
-                                                    xRow->getString(6),
+                                                    sTypeName,
                                                     xRow->getString(13),
                                                     xRow->getInt(11),
-                                                    xRow->getInt(7),
+                                                    nPrec,
                                                     xRow->getInt(9),
-                                                    xRow->getInt(5),
+                                                    nType,
                                                     sal_False,sal_False,sal_False,sal_True);
                 xRet = pRet;
                 break;
diff --git a/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index f96b34b35111..b66c1d7486fc 100644
--- a/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BPreparedStatement.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-21 13:38:44 $
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:49:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,42 +82,9 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 
 
-Reference< XResultSet > OAdabasPreparedStatement::getResultSet (sal_Bool checkCount) throw( SQLException)
+// -----------------------------------------------------------------------------
+OResultSet* OAdabasPreparedStatement::createResulSet()
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
-    if (OStatement_BASE::rBHelper.bDisposed)
-        throw DisposedException();
-
-    if (m_xResultSet.get().is())  // if resultset already retrieved,
-    {
-        // throw exception to avoid sequence error
-        throw SQLException(::rtl::OUString::createFromAscii("Invalid state for getResultSet"),*this,
-            ::rtl::OUString(),0,Any());
-    }
-
-    OAdabasResultSet* pRs = NULL;
-    sal_Int32 numCols = 1;
-
-    // If we already know we have result columns, checkCount
-    // is false.  This is an optimization to prevent unneeded
-    // calls to getColumnCount
-
-    if (checkCount)
-        numCols = getColumnCount ();
-
-    // Only return a result set if there are result columns
-
-    if (numCols > 0)
-    {
-        OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
-        pRs = new OAdabasResultSet(m_aStatementHandle,this);
-
-        // Save a copy of our last result set
-        // Changed to save copy at getResultSet.
-        //m_xResultSet = rs;
-    }
-    else
-        clearMyResultSet ();
-
-    return pRs;
-}
\ No newline at end of file
+    return new OAdabasResultSet(m_aStatementHandle,this);
+}
+// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/adabas/BResultSet.cxx b/connectivity/source/drivers/adabas/BResultSet.cxx
index 8c06666d3f3c..7178e3755ab4 100644
--- a/connectivity/source/drivers/adabas/BResultSet.cxx
+++ b/connectivity/source/drivers/adabas/BResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BResultSet.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-15 08:18:12 $
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:49:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,6 +61,9 @@
 #ifndef CONNECTIVITY_ADABAS_RESULTSET_HXX
 #include "adabas/BResultSet.hxx"
 #endif
+#ifndef CONNECTIVITY_ADABAS_RESULTSETMETADATA_HXX
+#include "adabas/BResultSetMetaData.hxx"
+#endif
 #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
 #include <com/sun/star/lang/DisposedException.hpp>
 #endif
@@ -238,6 +241,18 @@ void SAL_CALL OAdabasResultSet::refreshRow(  ) throw(SQLException, RuntimeExcept
     OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
 // -----------------------------------------------------------------------------
+Reference< XResultSetMetaData > SAL_CALL OAdabasResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+
+    if(!m_xMetaData.is())
+        m_xMetaData = new OAdabasResultSetMetaData(m_pStatement->getOwnConnection(),m_aStatementHandle);
+    return m_xMetaData;
+}
+// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index 478873b42c18..b52631541138 100644
--- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BResultSetMetaData.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-25 06:07:57 $
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:49:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,187 +62,41 @@
 #ifndef _CONNECTIVITY_ADABAS_BRESULTSETMETADATA_HXX_
 #include "adabas/BResultSetMetaData.hxx"
 #endif
-#ifndef _CONNECTIVITY_OTOOLS_HXX_
-#include "adabas/BTools.hxx"
+#ifndef _CONNECTIVITY_ADABAS_CATALOG_HXX_
+#include "adabas/BCatalog.hxx"
+#endif
+#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
+#include <com/sun/star/sdbc/DataType.hpp>
 #endif
 
+using namespace com::sun::star::sdbc;
+using namespace com::sun::star::uno;
 using namespace connectivity::adabas;
-// -------------------------------------------------------------------------
-OResultSetMetaData::~OResultSetMetaData()
-{
-}
-// -------------------------------------------------------------------------
-::rtl::OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    sal_Int32 column = _column;
-    if(_column < m_vMapping.size()) // use mapping
-        column = m_vMapping[_column];
-
-    sal_Int32 BUFFER_LEN = 128;
-    char *pName = new char[BUFFER_LEN];
-    SQLSMALLINT nRealLen=0;
-    OTools::ThrowException(N3SQLColAttribute(m_aStatementHandle,
-                                    column,
-                                    ident,
-                                    (SQLPOINTER)pName,
-                                    BUFFER_LEN,
-                                    &nRealLen,
-                                    NULL
-                                    ),m_aStatementHandle,SQL_HANDLE_STMT,*this);
-    if(nRealLen > BUFFER_LEN)
-    {
-        delete pName;
-        pName = new char[nRealLen];
-        OTools::ThrowException(N3SQLColAttribute(m_aStatementHandle,
-                                    column,
-                                    ident,
-                                    (SQLPOINTER)pName,
-                                    nRealLen,
-                                    &nRealLen,
-                                    NULL
-                                    ),m_aStatementHandle,SQL_HANDLE_STMT,*this);
-    }
+using namespace connectivity;
 
-    return ::rtl::OUString::createFromAscii(pName);
-}
-// -------------------------------------------------------------------------
-sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident) throw(starsdbc::SQLException, staruno::RuntimeException)
+OAdabasResultSetMetaData::OAdabasResultSetMetaData(odbc::OConnection*   _pConnection, SQLHANDLE _pStmt )
+: OAdabasResultSetMetaData_BASE(_pConnection,_pStmt)
 {
-    sal_Int32 column = _column;
-    if(_column < m_vMapping.size()) // use mapping
-        column = m_vMapping[_column];
-
-    sal_Int32 nValue;
-    OTools::ThrowException(N3SQLColAttribute(m_aStatementHandle,
-                                         column,
-                                         ident,
-                                         NULL,
-                                         0,
-                                         NULL,
-                                         &nValue),m_aStatementHandle,SQL_HANDLE_STMT,*this);
-    return nValue;
 }
-// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
+// -----------------------------------------------------------------------------
+OAdabasResultSetMetaData::OAdabasResultSetMetaData(odbc::OConnection*   _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping)
+: OAdabasResultSetMetaData_BASE(_pConnection,_pStmt,_vMapping)
 {
-    return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
 }
 // -------------------------------------------------------------------------
-
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
+OAdabasResultSetMetaData::~OAdabasResultSetMetaData()
 {
-    return OTools::MapOdbcType2Jdbc(getNumColAttrib(column,SQL_DESC_TYPE));
 }
-// -------------------------------------------------------------------------
-
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(starsdbc::SQLException, staruno::RuntimeException)
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL OAdabasResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
-    if(m_nColCount != -1)
-        return m_nColCount;
-    sal_Int16 nNumResultCols=0;
-    OTools::ThrowException(N3SQLNumResultCols(m_aStatementHandle,&nNumResultCols),m_aStatementHandle,SQL_HANDLE_STMT,*this);
-    return m_nColCount = nNumResultCols;
-}
-// -------------------------------------------------------------------------
+    sal_Int32 nType = OAdabasResultSetMetaData_BASE::getColumnType( column);
+    // special handling for float values which could be doubles
+    ::rtl::OUString sTypeName;
+    OAdabasCatalog::correctColumnProperties(getPrecision(column),nType,sTypeName);
 
-sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_CASE_SENSITIVE) == SQL_TRUE;
+    return nType;
 }
-// -------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getCharColAttrib(column,SQL_DESC_SCHEMA_NAME);
-}
-// -------------------------------------------------------------------------
-
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getCharColAttrib(column,SQL_DESC_NAME);
-}
-// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getCharColAttrib(column,SQL_DESC_TABLE_NAME);
-}
-// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getCharColAttrib(column,SQL_DESC_CATALOG_NAME);
-}
-// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getCharColAttrib(column,SQL_DESC_TYPE_NAME);
-}
-// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getCharColAttrib(column,SQL_DESC_LABEL);
-}
-// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return ::rtl::OUString();
-}
-// -------------------------------------------------------------------------
-
-sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_FIXED_PREC_SCALE) == SQL_TRUE;
-}
-// -------------------------------------------------------------------------
-
-sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_AUTO_UNIQUE_VALUE) == SQL_TRUE;
-}
-// -------------------------------------------------------------------------
-
-
-sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_UNSIGNED) == SQL_FALSE;
-}
-// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_PRECISION);
-}
-sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_SCALE);
-}
-// -------------------------------------------------------------------------
-
-sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_NULLABLE) == SQL_NULLABLE;
-}
-// -------------------------------------------------------------------------
-
-sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_SEARCHABLE) != SQL_PRED_NONE;
-}
-// -------------------------------------------------------------------------
-
-sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_READONLY;
-}
-// -------------------------------------------------------------------------
-
-sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE;
-;
-}
-// -------------------------------------------------------------------------
-sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(starsdbc::SQLException, staruno::RuntimeException)
-{
-    return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE;
-}
-// -------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/adabas/BStatement.cxx b/connectivity/source/drivers/adabas/BStatement.cxx
index 8bf13948bd22..90009ed70ca9 100644
--- a/connectivity/source/drivers/adabas/BStatement.cxx
+++ b/connectivity/source/drivers/adabas/BStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BStatement.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-21 13:38:44 $
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:49:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,43 +81,11 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 
-
-Reference< XResultSet > OAdabasStatement::getResultSet (sal_Bool checkCount) throw( SQLException)
+// -----------------------------------------------------------------------------
+OResultSet* OAdabasStatement::createResulSet()
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
-    if (OStatement_BASE::rBHelper.bDisposed)
-        throw DisposedException();
-
-    if (m_xResultSet.get().is())  // if resultset already retrieved,
-    {
-        // throw exception to avoid sequence error
-        throw SQLException(::rtl::OUString::createFromAscii("Invalid state for getResultSet"),*this,
-            ::rtl::OUString(),0,Any());
-    }
-
-    OAdabasResultSet* pRs = NULL;
-    sal_Int32 numCols = 1;
-
-    // If we already know we have result columns, checkCount
-    // is false.  This is an optimization to prevent unneeded
-    // calls to getColumnCount
-
-    if (checkCount)
-        numCols = getColumnCount ();
-
-    // Only return a result set if there are result columns
-
-    if (numCols > 0)
-    {
-        OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
-        pRs = new OAdabasResultSet(m_aStatementHandle,this);
+    return new OAdabasResultSet(m_aStatementHandle,this);
+}
+// -----------------------------------------------------------------------------
 
-        // Save a copy of our last result set
-        // Changed to save copy at getResultSet.
-        //m_xResultSet = rs;
-    }
-    else
-        clearMyResultSet ();
 
-    return pRs;
-}
\ No newline at end of file
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index a0ae483b75c3..b34c75cfad0e 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.19 $
+#   $Revision: 1.20 $
 #
-#   last change: $Author: vg $ $Date: 2001-05-16 14:43:49 $
+#   last change: $Author: oj $ $Date: 2001-08-02 10:49:44 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -101,6 +101,7 @@ SLOFILES=\
         $(SLO)$/BDatabaseMetaData.obj			\
         $(SLO)$/BPreparedStatement.obj          \
         $(SLO)$/BStatement.obj                  \
+        $(SLO)$/BResultSetMetaData.obj			\
         $(SLO)$/BResultSet.obj
         
 .IF "$(OS)"=="MACOSX"
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 897011d72b32..2b42dc6fbe35 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AGroup.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: oj $ $Date: 2001-06-20 07:16:56 $
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:49:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,7 +118,6 @@ OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase,    ADOGroup* _pGroup) :
     else
         m_aGroup.Create();
 
-    refreshUsers();
 }
 // -------------------------------------------------------------------------
 OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name) : OGroup_ADO(_Name,_bCase),m_pCatalog(_pParent)
@@ -126,7 +125,6 @@ OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString&
     construct();
     m_aGroup.Create();
     m_aGroup.put_Name(_Name);
-    refreshUsers();
 }
 // -------------------------------------------------------------------------
 void OAdoGroup::refreshUsers()
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 43547254534a..478a988a0f40 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AIndex.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-23 09:13:09 $
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:49:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,8 +103,6 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex
     construct();
     m_aIndex = WpADOIndex(_pIndex);
     fillPropertyValues();
-
-    refreshColumns();
 }
 // -------------------------------------------------------------------------
 OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection)
@@ -113,8 +111,6 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection)
 {
     construct();
     m_aIndex.Create();
-
-    refreshColumns();
 }
 
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 20dd3cb487bd..0b5e6383f9af 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AKey.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-23 09:13:09 $
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:49:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,7 +96,6 @@ OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection, ADOKey* _pKey)
     construct();
     m_aKey = WpADOKey(_pKey);
     fillPropertyValues();
-    refreshColumns();
 }
 // -------------------------------------------------------------------------
 OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection)
@@ -105,8 +104,6 @@ OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection)
 {
     construct();
     m_aKey.Create();
-
-    refreshColumns();
 }
 // -------------------------------------------------------------------------
 void OAdoKey::refreshColumns()
diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
new file mode 100644
index 000000000000..e603f5101420
--- /dev/null
+++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ *  $RCSfile: BResultSetMetaData.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: oj $ $Date: 2001-08-02 10:48:38 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the License); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an AS IS basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef CONNECTIVITY_ADABAS_RESULTSETMETADATA_HXX
+#define CONNECTIVITY_ADABAS_RESULTSETMETADATA_HXX
+
+#ifndef _CONNECTIVITY_ODBC_ORESULTSETMETADATA_HXX_
+#include "odbc/OResultSetMetaData.hxx"
+#endif
+
+namespace connectivity
+{
+    namespace adabas
+    {
+        //**************************************************************
+        //************ Class: ResultSetMetaData
+        //**************************************************************
+
+        typedef odbc::OResultSetMetaData OAdabasResultSetMetaData_BASE;
+        class OAdabasResultSetMetaData :    public  OAdabasResultSetMetaData_BASE
+        {
+        public:
+            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+            OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt );
+            OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping);
+            virtual ~OAdabasResultSetMetaData();
+
+            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        };
+    }
+}
+#endif // CONNECTIVITY_ADABAS_RESULTSETMETADATA_HXX