moved from file

5 files changed, 2849 insertions, 0 deletions

diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
new file mode 100644
index 000000000000..1e53adecfd41
--- /dev/null
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -0,0 +1,814 @@
+/*************************************************************************
+ *
+ *  $RCSfile: FDatabaseMetaDataResultSet.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: oj $ $Date: 2001-03-28 11:25:56 $
+ *
+ *  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_FDATABASEMETADATARESULTSET_HXX_
+#include "FDatabaseMetaDataResultSet.hxx"
+#endif
+#define CONNECTIVITY_PROPERTY_NAME_SPACE dbtools
+#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
+#include "propertyids.hxx"
+#endif
+#ifndef _CONNECTIVITY_DATABASEMETADATARESULTSETMETADATA_HXX_
+#include "FDatabaseMetaDataResultSetMetaData.hxx"
+#endif
+#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
+#include <com/sun/star/sdbc/DataType.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_KEYRULE_HPP_
+#include <com/sun/star/sdbc/KeyRule.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_PROCEDURERESULT_HPP_
+#include <com/sun/star/sdbc/ProcedureResult.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_INDEXTYPE_HPP_
+#include <com/sun/star/sdbc/IndexType.hpp>
+#endif
+#ifndef _COMPHELPER_PROPERTY_HXX_
+#include <comphelper/property.hxx>
+#endif
+#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
+#include <com/sun/star/lang/DisposedException.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_RESULTSETCONCURRENCY_HPP_
+#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_RESULTSETTYPE_HPP_
+#include <com/sun/star/sdbc/ResultSetType.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_FETCHDIRECTION_HPP_
+#include <com/sun/star/sdbc/FetchDirection.hpp>
+#endif
+#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#endif
+#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
+#include <cppuhelper/typeprovider.hxx>
+#endif
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
+#endif
+#ifndef _DBHELPER_DBEXCEPTION_HXX_
+#include "connectivity/dbexception.hxx"
+#endif
+
+using namespace connectivity;
+using namespace connectivity::dbtools;
+using namespace cppu;
+//------------------------------------------------------------------------------
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+// -------------------------------------------------------------------------
+ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet()
+    :ODatabaseMetaDataResultSet_BASE(m_aMutex)
+    ,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
+    ,m_aStatement(NULL)
+    ,m_xMetaData(NULL)
+    ,m_nRowPos(0)
+    ,m_bBOF(sal_True)
+{
+}
+
+// -------------------------------------------------------------------------
+ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
+{
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::construct()
+{
+    registerProperty(PROPERTY_FETCHSIZE,            PROPERTY_ID_FETCHSIZE,          0,&m_nFetchSize,        ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+    registerProperty(PROPERTY_RESULTSETTYPE,        PROPERTY_ID_RESULTSETTYPE,          PropertyAttribute::READONLY,&m_nResultSetType,       ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+    registerProperty(PROPERTY_FETCHDIRECTION,       PROPERTY_ID_FETCHDIRECTION,     0,  &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+    registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY,   PropertyAttribute::READONLY,&m_nResultSetConcurrency,                ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::disposing(void)
+{
+    OPropertySetHelper::disposing();
+
+    ::osl::MutexGuard aGuard(m_aMutex);
+    m_aStatement    = NULL;
+    m_xMetaData     = NULL;
+}
+// -------------------------------------------------------------------------
+Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
+{
+    Any aRet = OPropertySetHelper::queryInterface(rType);
+    if(!aRet.hasValue())
+        aRet = ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
+    return aRet;
+}
+// -------------------------------------------------------------------------
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
+                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
+                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+
+    return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
+}
+// -------------------------------------------------------------------------
+
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed )
+        throw DisposedException();
+
+    Reference< XResultSetMetaData > xMeta = getMetaData();
+    sal_Int32 nLen = xMeta->getColumnCount();
+    sal_Int32 i = 1;
+    for(;i<=nLen;++i)
+        if(xMeta->isCaseSensitive(i) ? columnName == xMeta->getColumnName(i) : columnName.equalsIgnoreCase(xMeta->getColumnName(i)))
+            break;
+    return i;
+}
+// -------------------------------------------------------------------------
+Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return NULL;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+
+    m_nColPos = columnIndex;
+    return NULL;
+}
+// -------------------------------------------------------------------------
+Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    if(m_aRowsIter == m_aRows.end())
+        return NULL;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+
+    return NULL;
+}
+
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return sal_False;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return 0;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return Sequence< sal_Int8 >();
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return ::com::sun::star::util::Date(0,0,0);
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return 0.0;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    if(m_aRowsIter == m_aRows.end())
+        return 0.0;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    if(m_aRowsIter == m_aRows.end())
+        return 0;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+
+// -------------------------------------------------------------------------
+
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    return m_nRowPos;
+}
+// -------------------------------------------------------------------------
+
+sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+                throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return sal_Int64();
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    if(!m_xMetaData.is())
+        m_xMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+
+    return m_xMetaData;
+}
+// -------------------------------------------------------------------------
+Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return NULL;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+
+    return NULL;
+}
+
+// -------------------------------------------------------------------------
+
+Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return NULL;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+
+    return NULL;
+}
+// -------------------------------------------------------------------------
+Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return NULL;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+
+    return NULL;
+}
+// -------------------------------------------------------------------------
+
+Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+                throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return NULL;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+
+    return NULL;
+}
+// -------------------------------------------------------------------------
+
+Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return Any();
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+                throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+    return (*m_aRowsIter)[columnIndex].makeAny();
+}
+// -------------------------------------------------------------------------
+
+sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return 0;
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    if(m_aRowsIter == m_aRows.end())
+        return ::rtl::OUString();
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+
+
+    m_nColPos = columnIndex;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+
+// -------------------------------------------------------------------------
+
+
+::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+    if(m_aRowsIter == m_aRows.end())
+        return ::com::sun::star::util::Time(0,0,0,0);
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+    m_nColPos = columnIndex;
+
+;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+
+::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    if(m_aRowsIter == m_aRows.end())
+        return ::com::sun::star::util::DateTime(0,0,0,0,0,0,0);
+
+    if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
+        throw SQLException(STAT_INVALID_INDEX,*this,::rtl::OUString(),0,Any());
+
+    m_nColPos = columnIndex;
+;
+
+    return (*m_aRowsIter)[columnIndex];
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+
+void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeException)
+{
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+                        throw DisposedException();
+    }
+    dispose();
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  ) throw(SQLException, RuntimeException)
+{
+    return m_aStatement.get();
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
+{
+    throw ::dbtools::FunctionSequenceException(*this);
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    if(m_bBOF)
+    {
+       m_aRowsIter = m_aRows.begin();
+       m_bBOF = sal_False;
+       return m_aRowsIter != m_aRows.end();
+    }
+
+    if(m_aRowsIter == m_aRows.end())
+        return sal_False;
+
+    ++m_aRowsIter;
+
+    return m_aRowsIter != m_aRows.end();
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+
+    if(m_aRowsIter == m_aRows.end())
+        return sal_True;
+
+    return (*m_aRowsIter)[m_nColPos].isNull();
+}
+// -------------------------------------------------------------------------
+void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+}
+// -------------------------------------------------------------------------
+
+void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
+        throw DisposedException();
+}
+// -------------------------------------------------------------------------
+void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
+{
+}
+// -------------------------------------------------------------------------
+Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
+{
+    return Any();
+}
+// -------------------------------------------------------------------------
+::cppu::IPropertyArrayHelper* ODatabaseMetaDataResultSet::createArrayHelper( ) const
+{
+    Sequence< Property > aProps;
+    describeProperties(aProps);
+    return new ::cppu::OPropertyArrayHelper(aProps);
+}
+// -------------------------------------------------------------------------
+::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper()
+{
+    return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper();
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setProceduresMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setProceduresMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setCatalogsMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setCatalogsMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setSchemasMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setSchemasMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setColumnPrivilegesMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setColumnPrivilegesMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setColumnsMap()
+{
+
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setColumnsMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setTablesMap()
+{
+
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setTablesMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setProcedureColumnsMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setProcedureColumnsMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setPrimaryKeysMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setProcedureColumnsMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setIndexInfoMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setIndexInfoMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setTablePrivilegesMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setCrossReferenceMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setCrossReferenceMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setVersionColumnsMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setVersionColumnsMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setBestRowIdentifierMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setBestRowIdentifierMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setTypeInfoMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setTypeInfoMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setTableTypes()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setTableTypes();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setExportedKeysMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setExportedKeysMap();
+    m_xMetaData = pMetaData;
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSet::setImportedKeysMap()
+{
+    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(this);
+    pMetaData->setImportedKeysMap();
+    m_xMetaData = pMetaData;
+}
+
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
new file mode 100644
index 000000000000..9830b634ded8
--- /dev/null
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -0,0 +1,795 @@
+/*************************************************************************
+ *
+ *  $RCSfile: FDatabaseMetaDataResultSetMetaData.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: oj $ $Date: 2001-03-28 11:26:10 $
+ *
+ *  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_DATABASEMETADATARESULTSETMETADATA_HXX_
+#include "FDatabaseMetaDataResultSetMetaData.hxx"
+#endif
+#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
+#include <com/sun/star/sdbc/DataType.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_PROCEDURERESULT_HPP_
+#include <com/sun/star/sdbc/ProcedureResult.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_
+#include <com/sun/star/sdbc/ColumnValue.hpp>
+#endif
+#define CONNECTIVITY_PROPERTY_NAME_SPACE dbtools
+#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
+#include "propertyids.hxx"
+#endif
+
+using namespace connectivity;
+using namespace connectivity::dbtools;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+
+// -------------------------------------------------------------------------
+ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData()
+{
+}
+// -------------------------------------------------------------------------
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getColumnDisplaySize();
+
+    return 0;
+}
+// -------------------------------------------------------------------------
+
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getColumnType();
+    return 1;
+}
+// -------------------------------------------------------------------------
+
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
+{
+    return m_mColumns.size();
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.isCaseSensitive();
+    return sal_True;
+}
+// -------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    return ::rtl::OUString();
+}
+// -------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getColumnName();
+    return ::rtl::OUString();
+}
+// -------------------------------------------------------------------------
+::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getTableName();
+    return ::rtl::OUString();
+}
+// -------------------------------------------------------------------------
+::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    return ::rtl::OUString();
+}
+// -------------------------------------------------------------------------
+::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getColumnTypeName();
+    return ::rtl::OUString();
+}
+// -------------------------------------------------------------------------
+::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getColumnLabel();
+    return getColumnName(column);
+}
+// -------------------------------------------------------------------------
+::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getColumnServiceName();
+    return ::rtl::OUString();
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.isCurrency();
+    return sal_False;
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.isAutoIncrement();
+    return sal_False;
+}
+// -------------------------------------------------------------------------
+
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.isSigned();
+    return sal_False;
+}
+// -------------------------------------------------------------------------
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getPrecision();
+    return 0;
+}
+// -------------------------------------------------------------------------
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.getScale();
+
+    return 0;
+}
+// -------------------------------------------------------------------------
+
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.isNullable();
+
+    return sal_False;
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+        return (*m_mColumnsIter).second.isSearchable();
+    return sal_True;
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+//  if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+//      return (*m_mColumnsIter).second.isReadOnly();
+
+    return sal_True;
+}
+// -------------------------------------------------------------------------
+
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+//  if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+//      return (*m_mColumnsIter).second.isDefinitelyWritable();
+
+    return sal_False;
+;
+}
+// -------------------------------------------------------------------------
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
+{
+//  if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+//      return (*m_mColumnsIter).second.isWritable();
+    return isDefinitelyWritable(column);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"),
+                ColumnValue::NO_NULLS,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+                ColumnValue::NO_NULLS,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTOR"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTEE"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRIVILEGE"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("IS_GRANTABLE"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"),
+                ColumnValue::NO_NULLS,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+                ColumnValue::NO_NULLS,
+        3,3,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_SIZE"),
+                ColumnValue::NO_NULLS,
+        3,3,0,
+                DataType::INTEGER);
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("BUFFER_LENGTH"),
+                ColumnValue::NULLABLE,
+        3,3,0,
+                DataType::INTEGER);
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DECIMAL_DIGITS"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NUM_PREC_RADIX"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_DEF"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATA_TYPE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATETIME_SUB"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CHAR_OCTET_LENGTH"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("ORDINAL_POSITION"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("IS_NULLABLE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setTablesMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_TYPE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
+{
+   m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_TYPE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRECISION"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("LENGTH"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SCALE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RADIX"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("KEY_SEQ"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PK_NAME"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NON_UNIQUE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::BIT);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("INDEX_QUALIFIER"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("INDEX_NAME"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("ORDINAL_POSITION"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("ASC_OR_DESC"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CARDINALITY"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PAGES"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FILTER_CONDITION"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTOR"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTEE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRIVILEGE"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("IS_GRANTABLE"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PKTABLE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PKTABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PKTABLE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PKCOLUMN_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FKTABLE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FKTABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FKTABLE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FKCOLUMN_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("KEY_SEQ"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("UPDATE_RULE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DELETE_RULE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FK_NAME"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PK_NAME"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DEFERRABILITY"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRECISION"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("LITERAL_PREFIX"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("LITERAL_SUFFIX"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CREATE_PARAMS"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CASE_SENSITIVE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::BIT);
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SEARCHABLE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("UNSIGNED_ATTRIBUTE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::BIT);
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FIXED_PREC_SCALE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::BIT);
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("AUTO_INCREMENT"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::BIT);
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("LOCAL_TYPE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("MINIMUM_SCALE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("MAXIMUM_SCALE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATA_TYPE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATETIME_SUB"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NUM_PREC_RADIX"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RESERVED1"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RESERVED2"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RESERVED3"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_TYPE"),
+                ColumnValue::NO_NULLS,
+        1,1,0,
+                DataType::INTEGER);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setTableTypes()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_TYPE"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setCatalogsMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setSchemasMap()
+{
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::VARCHAR);
+}
+// -------------------------------------------------------------------------
+void ODatabaseMetaDataResultSetMetaData::setVersionColumnsMap()
+{
+   m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SCOPE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::VARCHAR);
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_SIZE"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("BUFFER_LENGTH"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DECIMAL_DIGITS"),
+                ColumnValue::NULLABLE,
+        0,0,0,
+                DataType::INTEGER);
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PSEUDO_COLUMN"),
+                ColumnValue::NO_NULLS,
+        0,0,0,
+                DataType::INTEGER);
+}
+
+
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
new file mode 100644
index 000000000000..e71a7e1af5a9
--- /dev/null
+++ b/connectivity/source/commontools/FValue.cxx
@@ -0,0 +1,837 @@
+/*************************************************************************
+ *
+ *  $RCSfile: FValue.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: oj $ $Date: 2001-03-28 11:26:02 $
+ *
+ *  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): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include <stdio.h>
+
+#ifndef _CONNECTIVITY_FILE_VALUE_HXX_
+#include "FValue.hxx"
+#endif
+#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+#include "connectivity/CommonTools.hxx"
+#endif
+#ifndef _DBHELPER_DBCONVERSION_HXX_
+#include <connectivity/dbconversion.hxx>
+#endif
+
+using namespace connectivity;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
+
+// -----------------------------------------------------------------------------
+void ORowSetValue::free()
+{
+    if(!m_bNull)
+    {
+        switch(m_eTypeKind)
+        {
+            case ::com::sun::star::sdbc::DataType::CHAR:
+            case ::com::sun::star::sdbc::DataType::VARCHAR:
+                OSL_ENSURE(m_aValue.m_pString,"String pointer is null!");
+                rtl_uString_release(m_aValue.m_pString);
+                m_aValue.m_pString = NULL;
+                break;
+            case ::com::sun::star::sdbc::DataType::DOUBLE:
+            case ::com::sun::star::sdbc::DataType::FLOAT:
+            case ::com::sun::star::sdbc::DataType::REAL:
+            case ::com::sun::star::sdbc::DataType::DECIMAL:
+            case ::com::sun::star::sdbc::DataType::NUMERIC:
+                delete (double*)m_aValue.m_pValue;
+                m_aValue.m_pValue = NULL;
+                break;
+            case ::com::sun::star::sdbc::DataType::DATE:
+                delete (::com::sun::star::util::Date*)m_aValue.m_pValue;
+                m_aValue.m_pValue = NULL;
+                break;
+            case ::com::sun::star::sdbc::DataType::TIME:
+                delete (::com::sun::star::util::Time*)m_aValue.m_pValue;
+                m_aValue.m_pValue = NULL;
+                break;
+            case ::com::sun::star::sdbc::DataType::TIMESTAMP:
+                delete (::com::sun::star::util::DateTime*)m_aValue.m_pValue;
+                m_aValue.m_pValue = NULL;
+                break;
+            case ::com::sun::star::sdbc::DataType::BINARY:
+            case ::com::sun::star::sdbc::DataType::VARBINARY:
+            case ::com::sun::star::sdbc::DataType::LONGVARBINARY:
+            case ::com::sun::star::sdbc::DataType::LONGVARCHAR:
+                delete (::com::sun::star::uno::Sequence<sal_Int8>*)m_aValue.m_pValue;
+                m_aValue.m_pValue = NULL;
+                break;
+            case ::com::sun::star::sdbc::DataType::OBJECT:
+                delete (::com::sun::star::uno::Any*)m_aValue.m_pValue;
+                m_aValue.m_pValue = NULL;
+                break;
+
+        }
+        m_bNull = sal_True;
+    }
+}
+// -----------------------------------------------------------------------------
+ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH)
+{
+    if(&_rRH == this)
+        return *this;
+
+    free();
+
+    m_bBound    = _rRH.m_bBound;
+    m_bNull     = _rRH.m_bNull;
+    m_eTypeKind = _rRH.m_eTypeKind;
+    if(!m_bNull)
+    {
+        switch(_rRH.m_eTypeKind)
+        {
+        case DataType::CHAR:
+        case DataType::VARCHAR:
+            m_aValue.m_pString = _rRH.m_aValue.m_pString;
+            rtl_uString_acquire(m_aValue.m_pString);
+            break;
+        case DataType::DOUBLE:
+        case DataType::FLOAT:
+        case DataType::REAL:
+        case DataType::DECIMAL:
+        case DataType::NUMERIC:
+            m_aValue.m_pValue   = new double(*(double*)_rRH.m_aValue.m_pValue);
+            break;
+        case DataType::DATE:
+            m_aValue.m_pValue   = new Date(*(Date*)_rRH.m_aValue.m_pValue);
+            break;
+        case DataType::TIME:
+            m_aValue.m_pValue   = new Time(*(Time*)_rRH.m_aValue.m_pValue);
+            break;
+        case DataType::TIMESTAMP:
+            m_aValue.m_pValue   = new DateTime(*(DateTime*)_rRH.m_aValue.m_pValue);
+            break;
+        case DataType::BINARY:
+        case DataType::VARBINARY:
+        case DataType::LONGVARBINARY:
+        case DataType::LONGVARCHAR:
+            m_aValue.m_pValue   = new Sequence<sal_Int8>(*(Sequence<sal_Int8>*)_rRH.m_aValue.m_pValue);
+            break;
+        case DataType::BIT:
+            m_aValue.m_bBool    = _rRH.m_aValue.m_bBool;
+            break;
+        case DataType::TINYINT:
+        case DataType::SMALLINT:
+        case DataType::INTEGER:
+            m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32;
+            break;
+        default:
+            OSL_ASSERT("Invalid type!");
+        }
+    }
+
+    return *this;
+}
+// -------------------------------------------------------------------------
+
+ORowSetValue& ORowSetValue::operator=(const Date& _rRH)
+{
+    free();
+    if(m_bNull)
+    {
+        m_aValue.m_pValue = new Date(_rRH);
+        m_eTypeKind = DataType::DATE;
+    }
+    else
+        *(Date*)m_aValue.m_pValue = _rRH;
+
+    m_bNull = sal_False;
+    return *this;
+}
+// -------------------------------------------------------------------------
+ORowSetValue& ORowSetValue::operator=(const Time& _rRH)
+{
+    free();
+    if(m_bNull)
+    {
+        m_aValue.m_pValue = new Time(_rRH);
+        m_eTypeKind = DataType::TIME;
+    }
+    else
+        *(Time*)m_aValue.m_pValue = _rRH;
+
+    m_bNull = sal_False;
+    return *this;
+}
+// -------------------------------------------------------------------------
+ORowSetValue& ORowSetValue::operator=(const DateTime& _rRH)
+{
+    free();
+    if(m_bNull)
+    {
+        m_aValue.m_pValue = new DateTime(_rRH);
+        m_eTypeKind = DataType::TIMESTAMP;
+    }
+    else
+        *(DateTime*)m_aValue.m_pValue = _rRH;
+
+    m_bNull = sal_False;
+
+    return *this;
+}
+// -------------------------------------------------------------------------
+
+ORowSetValue& ORowSetValue::operator=(const ::rtl::OUString& _rRH)
+{
+    free();
+    m_bNull = sal_False;
+
+    m_aValue.m_pString = _rRH.pData;
+    rtl_uString_acquire(m_aValue.m_pString);
+    m_eTypeKind = DataType::VARCHAR;
+
+    return *this;
+}
+// -------------------------------------------------------------------------
+
+ORowSetValue& ORowSetValue::operator=(const double& _rRH)
+{
+    free();
+    if(m_bNull)
+    {
+        m_aValue.m_pValue = new double(_rRH);
+        m_eTypeKind = DataType::DOUBLE;
+    }
+    else
+        *(double*)m_aValue.m_pValue = _rRH;
+
+    m_bNull = sal_False;
+    return *this;
+}
+// -------------------------------------------------------------------------
+
+ORowSetValue& ORowSetValue::operator=(const sal_Int8& _rRH)
+{
+    free();
+    m_bNull = sal_False;
+    m_aValue.m_nInt8 = _rRH;
+    m_eTypeKind = DataType::TINYINT;
+    return *this;
+}
+// -------------------------------------------------------------------------
+
+ORowSetValue& ORowSetValue::operator=(const sal_Int16& _rRH)
+{
+    free();
+    m_bNull = sal_False;
+    m_aValue.m_nInt16 = _rRH;
+    m_eTypeKind = DataType::SMALLINT;
+    return *this;
+}
+// -------------------------------------------------------------------------
+
+ORowSetValue& ORowSetValue::operator=(const sal_Int32& _rRH)
+{
+    free();
+    m_bNull = sal_False;
+    m_aValue.m_nInt32 = _rRH;
+    m_eTypeKind = DataType::INTEGER;
+    return *this;
+}
+// -------------------------------------------------------------------------
+
+ORowSetValue& ORowSetValue::operator=(const sal_Bool _rRH)
+{
+    free();
+    m_bNull = sal_False;
+    m_aValue.m_bBool = _rRH;
+    m_eTypeKind = DataType::BIT;
+    return *this;
+}
+// -------------------------------------------------------------------------
+ORowSetValue& ORowSetValue::operator=(const sal_Int64& _rRH)
+{
+    free();
+    if(m_bNull)
+    {
+        m_aValue.m_pValue = new sal_Int64(_rRH);
+        m_eTypeKind = DataType::DOUBLE;
+    }
+    else
+        *(sal_Int64*)m_aValue.m_pValue = _rRH;
+    m_bNull = sal_False;
+
+    return *this;
+}
+// -------------------------------------------------------------------------
+ORowSetValue& ORowSetValue::operator=(const Sequence<sal_Int8>& _rRH)
+{
+    free();
+    if(m_bNull)
+    {
+        m_aValue.m_pValue = new Sequence<sal_Int8>(_rRH);
+
+    }
+    else
+        *(Sequence<sal_Int8>*)m_aValue.m_pValue = _rRH;
+
+    m_bNull = sal_False;
+
+    return *this;
+}
+// -------------------------------------------------------------------------
+ORowSetValue& ORowSetValue::operator=(const Any& _rAny)
+{
+    free();
+    m_eTypeKind = DataType::OBJECT;
+    if(m_bNull)
+        m_aValue.m_pValue = new Any(_rAny);
+    else
+        *(Any*)m_aValue.m_pValue = _rAny;
+
+    m_bNull = sal_False;
+
+    return *this;
+}
+// -------------------------------------------------------------------------
+
+sal_Bool operator==(const Date& _rLH,const Date& _rRH)
+{
+    return _rLH.Day == _rRH.Day && _rLH.Month == _rRH.Month && _rLH.Year == _rRH.Year;
+}
+// -------------------------------------------------------------------------
+
+sal_Bool operator==(const Time& _rLH,const Time& _rRH)
+{
+    return _rLH.Minutes == _rRH.Minutes && _rLH.Hours == _rRH.Hours && _rLH.Seconds == _rRH.Seconds && _rLH.HundredthSeconds == _rRH.HundredthSeconds;
+}
+// -------------------------------------------------------------------------
+
+sal_Bool operator==(const DateTime& _rLH,const DateTime& _rRH)
+{
+    return _rLH.Day == _rRH.Day && _rLH.Month == _rRH.Month && _rLH.Year == _rRH.Year &&
+        _rLH.Minutes == _rRH.Minutes && _rLH.Hours == _rRH.Hours && _rLH.Seconds == _rRH.Seconds && _rLH.HundredthSeconds == _rRH.HundredthSeconds;
+}
+// -------------------------------------------------------------------------
+
+ORowSetValue::operator==(const ORowSetValue& _rRH) const
+{
+    if(m_eTypeKind != _rRH.m_eTypeKind)
+        return sal_False;
+    if(m_bNull != _rRH.isNull())
+        return sal_False;
+    if(m_bNull && _rRH.isNull())
+        return sal_True;
+
+    sal_Bool bRet = sal_False;
+    if(!m_bNull)
+    {
+        switch(m_eTypeKind)
+        {
+            case DataType::VARCHAR:
+            case DataType::CHAR:
+            {
+                ::rtl::OUString aVal1(m_aValue.m_pString);
+                ::rtl::OUString aVal2(_rRH.m_aValue.m_pString);
+                bRet = aVal1 == aVal2;
+                break;
+            }
+            case DataType::LONGVARCHAR:
+                bRet = *(Sequence<sal_Int8>*)m_aValue.m_pValue == *(Sequence<sal_Int8>*)_rRH.m_aValue.m_pValue;
+                break;
+            case DataType::DOUBLE:
+            case DataType::FLOAT:
+            case DataType::REAL:
+            case DataType::DECIMAL:
+            case DataType::NUMERIC:
+                bRet = *(double*)m_aValue.m_pValue == *(double*)_rRH.m_aValue.m_pValue;
+                break;
+            case DataType::TINYINT:
+                bRet = m_aValue.m_nInt8 == _rRH.m_aValue.m_nInt8;
+                break;
+            case DataType::SMALLINT:
+                bRet = m_aValue.m_nInt16 == _rRH.m_aValue.m_nInt16;
+                break;
+            case DataType::INTEGER:
+                bRet = m_aValue.m_nInt32 == _rRH.m_aValue.m_nInt32;
+                break;
+            case DataType::BIT:
+                bRet = m_aValue.m_bBool == _rRH.m_aValue.m_bBool;
+                break;
+            case DataType::DATE:
+                bRet = *(Date*)m_aValue.m_pValue == *(Date*)_rRH.m_aValue.m_pValue;
+                break;
+            case DataType::TIME:
+                bRet = *(Time*)m_aValue.m_pValue == *(Time*)_rRH.m_aValue.m_pValue;
+                break;
+            case DataType::TIMESTAMP:
+                bRet = *(DateTime*)m_aValue.m_pValue == *(DateTime*)_rRH.m_aValue.m_pValue;
+                break;
+            case DataType::BINARY:
+            case DataType::VARBINARY:
+            case DataType::LONGVARBINARY:
+                bRet = sal_False;
+                break;
+        }
+    }
+    return bRet;
+}
+// -------------------------------------------------------------------------
+Any ORowSetValue::makeAny() const
+{
+    Any rValue;
+    if(isBound() && !isNull())
+    {
+        switch(getTypeKind())
+        {
+            case DataType::CHAR:
+            case DataType::VARCHAR:
+                rValue <<= (::rtl::OUString)m_aValue.m_pString;
+                break;
+            case DataType::DOUBLE:
+            case DataType::FLOAT:
+            case DataType::REAL:
+            case DataType::DECIMAL:
+            case DataType::NUMERIC:
+                rValue <<= *(double*)m_aValue.m_pValue;
+                break;
+            case DataType::DATE:
+                rValue <<= *(Date*)m_aValue.m_pValue;
+                break;
+            case DataType::TIME:
+                rValue <<= *(Time*)m_aValue.m_pValue;
+                break;
+            case DataType::TIMESTAMP:
+                rValue <<= *(DateTime*)m_aValue.m_pValue;
+                break;
+            case DataType::BINARY:
+            case DataType::VARBINARY:
+            case DataType::LONGVARBINARY:
+            case DataType::LONGVARCHAR:
+                rValue <<= *(Sequence<sal_Int8>*)m_aValue.m_pValue;
+                break;
+            case DataType::OBJECT:
+                rValue = getAny();
+                break;
+            case DataType::BIT:
+                rValue.setValue( &m_aValue.m_bBool, ::getCppuBooleanType() );
+                break;
+            case DataType::TINYINT:
+                rValue <<= m_aValue.m_nInt8;
+                break;
+            case DataType::SMALLINT:
+                rValue <<= m_aValue.m_nInt16;
+                break;
+            case DataType::INTEGER:
+                rValue <<= m_aValue.m_nInt32;
+                break;
+            default:
+                OSL_ENSURE(0,"ORowSetValue::makeAny(): UNSPUPPORTED TYPE!");
+        }
+    }
+    return rValue;
+}
+// -------------------------------------------------------------------------
+::rtl::OUString ORowSetValue::getString( ) const
+{
+    ::rtl::OUString aRet;
+    switch(getTypeKind())
+    {
+        case DataType::CHAR:
+        case DataType::VARCHAR:
+            aRet = m_aValue.m_pString;
+            break;
+        case DataType::LONGVARCHAR:
+            {
+                Sequence<sal_Int8> aSeq(getSequence());
+                if(aSeq.getLength())
+                    aRet = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(aSeq.getArray()),aSeq.getLength()/sizeof(sal_Unicode));
+            }
+            break;
+        case DataType::DOUBLE:
+        case DataType::FLOAT:
+        case DataType::REAL:
+        case DataType::DECIMAL:
+        case DataType::NUMERIC:
+            aRet = ::rtl::OUString::valueOf((double)*this);
+            break;
+        case DataType::DATE:
+            aRet = connectivity::toDateString(*this);
+            break;
+        case DataType::TIME:
+            aRet = connectivity::toTimeString(*this);
+            break;
+        case DataType::TIMESTAMP:
+            aRet = connectivity::toDateTimeString(*this);
+            break;
+        case DataType::BINARY:
+        case DataType::VARBINARY:
+        case DataType::LONGVARBINARY:
+            {
+                aRet = ::rtl::OUString::createFromAscii("0x");
+                Sequence<sal_Int8> aSeq(getSequence());
+                const sal_Int8* pBegin  = aSeq.getConstArray();
+                const sal_Int8* pEnd    = pBegin + aSeq.getLength();
+                for(;pBegin != pEnd;++pBegin)
+                    aRet += ::rtl::OUString::valueOf((sal_Int32)*pBegin,16);
+            }
+            break;
+        case DataType::BIT:
+            aRet = ::rtl::OUString::valueOf((sal_Int32)(sal_Bool)*this);
+            break;
+        case DataType::TINYINT:
+            aRet = ::rtl::OUString::valueOf((sal_Int32)(sal_Int8)*this);
+            break;
+        case DataType::SMALLINT:
+            aRet = ::rtl::OUString::valueOf((sal_Int32)(sal_Int16)*this);
+            break;
+        case DataType::INTEGER:
+            aRet = ::rtl::OUString::valueOf((sal_Int32)*this);
+            break;
+    }
+    return aRet;
+}
+// -------------------------------------------------------------------------
+sal_Bool ORowSetValue::getBool()    const
+{
+    OSL_ENSURE(m_bBound,"Value is not bound!");
+
+    sal_Bool bRet = sal_False;
+    switch(getTypeKind())
+    {
+        case DataType::CHAR:
+        case DataType::VARCHAR:
+            bRet = ::rtl::OUString(m_aValue.m_pString).toInt32() != 0;
+            break;
+        case DataType::LONGVARCHAR:
+            bRet = getString().toInt32() != 0;
+            break;
+        case DataType::DOUBLE:
+        case DataType::FLOAT:
+        case DataType::REAL:
+        case DataType::DECIMAL:
+        case DataType::NUMERIC:
+            bRet = *(double*)m_aValue.m_pValue != 0.0;
+            break;
+        case DataType::DATE:
+        case DataType::TIME:
+        case DataType::TIMESTAMP:
+        case DataType::BINARY:
+        case DataType::VARBINARY:
+        case DataType::LONGVARBINARY:
+            OSL_ASSERT("getBool() for this type is not allowed!");
+            break;
+        case DataType::BIT:
+            bRet = m_aValue.m_bBool;
+            break;
+        case DataType::TINYINT:
+            bRet = m_aValue.m_nInt8  != 0;
+            break;
+        case DataType::SMALLINT:
+            bRet = m_aValue.m_nInt16 != 0;
+            break;
+        case DataType::INTEGER:
+            bRet = m_aValue.m_nInt32 != 0;
+            break;
+    }
+    return bRet;
+}
+// -------------------------------------------------------------------------
+sal_Int8 ORowSetValue::getInt8()    const
+{
+    OSL_ENSURE(m_bBound,"Value is not bound!");
+
+    sal_Int8 nRet = 0;
+    switch(getTypeKind())
+    {
+        case DataType::CHAR:
+        case DataType::VARCHAR:
+            nRet = sal_Int8(::rtl::OUString(m_aValue.m_pString).toInt32());
+            break;
+        case DataType::LONGVARCHAR:
+            nRet = sal_Int8(getString().toInt32());
+            break;
+        case DataType::DOUBLE:
+        case DataType::FLOAT:
+        case DataType::REAL:
+        case DataType::DECIMAL:
+        case DataType::NUMERIC:
+            nRet = sal_Int8(*(double*)m_aValue.m_pValue);
+            break;
+        case DataType::DATE:
+        case DataType::TIME:
+        case DataType::TIMESTAMP:
+        case DataType::BINARY:
+        case DataType::VARBINARY:
+        case DataType::LONGVARBINARY:
+            OSL_ASSERT("getInt8() for this type is not allowed!");
+            break;
+        case DataType::BIT:
+            nRet = m_aValue.m_bBool;
+            break;
+        case DataType::TINYINT:
+            nRet = m_aValue.m_nInt8;
+            break;
+        case DataType::SMALLINT:
+            nRet = sal_Int8(m_aValue.m_nInt16);
+            break;
+        case DataType::INTEGER:
+            nRet = sal_Int8(m_aValue.m_nInt32);
+            break;
+    }
+    return nRet;
+}
+// -------------------------------------------------------------------------
+sal_Int16 ORowSetValue::getInt16()  const
+{
+    OSL_ENSURE(m_bBound,"Value is not bound!");
+
+    sal_Int16 nRet = 0;
+    switch(getTypeKind())
+    {
+        case DataType::CHAR:
+        case DataType::VARCHAR:
+            nRet = sal_Int16(::rtl::OUString(m_aValue.m_pString).toInt32());
+            break;
+        case DataType::LONGVARCHAR:
+            nRet = sal_Int16(getString().toInt32());
+            break;
+        case DataType::DOUBLE:
+        case DataType::FLOAT:
+        case DataType::REAL:
+        case DataType::DECIMAL:
+        case DataType::NUMERIC:
+            nRet = sal_Int16(*(double*)m_aValue.m_pValue);
+            break;
+        case DataType::DATE:
+        case DataType::TIME:
+        case DataType::TIMESTAMP:
+        case DataType::BINARY:
+        case DataType::VARBINARY:
+        case DataType::LONGVARBINARY:
+            OSL_ASSERT("getInt16() for this type is not allowed!");
+            break;
+        case DataType::BIT:
+            nRet = m_aValue.m_bBool;
+            break;
+        case DataType::TINYINT:
+            nRet = m_aValue.m_nInt8;
+            break;
+        case DataType::SMALLINT:
+            nRet = m_aValue.m_nInt16;
+            break;
+        case DataType::INTEGER:
+            nRet = (sal_Int16)m_aValue.m_nInt32;
+            break;
+    }
+    return nRet;
+}
+// -------------------------------------------------------------------------
+sal_Int32 ORowSetValue::getInt32()  const
+{
+    OSL_ENSURE(m_bBound,"Value is not bound!");
+
+    sal_Int32 nRet = 0;
+    switch(getTypeKind())
+    {
+        case DataType::CHAR:
+        case DataType::VARCHAR:
+            nRet = ::rtl::OUString(m_aValue.m_pString).toInt32();
+            break;
+        case DataType::LONGVARCHAR:
+            nRet = getString().toInt32();
+            break;
+        case DataType::DOUBLE:
+        case DataType::FLOAT:
+        case DataType::REAL:
+        case DataType::DECIMAL:
+        case DataType::NUMERIC:
+            nRet = sal_Int32(*(double*)m_aValue.m_pValue);
+            break;
+        case DataType::DATE:
+            nRet = dbtools::DBTypeConversion::toDays(*(::com::sun::star::util::Date*)m_aValue.m_pValue);
+            break;
+        case DataType::TIME:
+        case DataType::TIMESTAMP:
+        case DataType::BINARY:
+        case DataType::VARBINARY:
+        case DataType::LONGVARBINARY:
+            OSL_ASSERT("getInt32() for this type is not allowed!");
+            break;
+        case DataType::BIT:
+            nRet = m_aValue.m_bBool;
+            break;
+        case DataType::TINYINT:
+            nRet = m_aValue.m_nInt8;
+            break;
+        case DataType::SMALLINT:
+            nRet = m_aValue.m_nInt16;
+            break;
+        case DataType::INTEGER:
+            nRet = m_aValue.m_nInt32;
+            break;
+    }
+    return nRet;
+}
+// -------------------------------------------------------------------------
+double ORowSetValue::getDouble()    const
+{
+    OSL_ENSURE(m_bBound,"Value is not bound!");
+
+    double nRet = 0;
+    switch(getTypeKind())
+    {
+        case DataType::CHAR:
+        case DataType::VARCHAR:
+            nRet = ::rtl::OUString(m_aValue.m_pString).toDouble();
+            break;
+        case DataType::LONGVARCHAR:
+            nRet = getString().toDouble();
+            break;
+        case DataType::DOUBLE:
+        case DataType::FLOAT:
+        case DataType::REAL:
+        case DataType::DECIMAL:
+        case DataType::NUMERIC:
+            nRet = *(double*)m_aValue.m_pValue;
+            break;
+        case DataType::DATE:
+            nRet = dbtools::DBTypeConversion::toDouble(*(::com::sun::star::util::Date*)m_aValue.m_pValue);
+            break;
+        case DataType::TIME:
+            nRet = dbtools::DBTypeConversion::toDouble(*(::com::sun::star::util::Time*)m_aValue.m_pValue);
+            break;
+        case DataType::TIMESTAMP:
+            nRet = dbtools::DBTypeConversion::toDouble(*(::com::sun::star::util::DateTime*)m_aValue.m_pValue);
+            break;
+        case DataType::BINARY:
+        case DataType::VARBINARY:
+        case DataType::LONGVARBINARY:
+            OSL_ASSERT("getDouble() for this type is not allowed!");
+            break;
+        case DataType::BIT:
+            nRet = m_aValue.m_bBool;
+            break;
+        case DataType::TINYINT:
+            nRet = m_aValue.m_nInt8;
+            break;
+        case DataType::SMALLINT:
+            nRet = m_aValue.m_nInt16;
+            break;
+        case DataType::INTEGER:
+            nRet = m_aValue.m_nInt32;
+            break;
+    }
+    return nRet;
+}
+// -------------------------------------------------------------------------
+void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype)
+{
+    free();
+
+    m_bNull = sal_False;
+    switch(_nDatatype)
+    {
+        case DataType::CHAR:
+        case DataType::VARCHAR:
+            {
+                ::rtl::OUString aVal = ::rtl::OUString::valueOf(_rVal);
+                m_aValue.m_pString = aVal.pData;
+                rtl_uString_acquire(m_aValue.m_pString);
+            }
+            break;
+        case DataType::LONGVARCHAR:
+            {
+                ::rtl::OUString aVal = ::rtl::OUString::valueOf(_rVal);
+                m_aValue.m_pValue = new Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(aVal.getStr()),aVal.getLength());
+            }
+            break;
+        case DataType::DOUBLE:
+        case DataType::FLOAT:
+        case DataType::REAL:
+        case DataType::DECIMAL:
+        case DataType::NUMERIC:
+            m_aValue.m_pValue = new double(_rVal);
+            break;
+        case DataType::DATE:
+            m_aValue.m_pValue = new Date(dbtools::DBTypeConversion::toDate(_rVal));
+            break;
+        case DataType::TIME:
+            m_aValue.m_pValue = new Time(dbtools::DBTypeConversion::toTime(_rVal));
+            break;
+        case DataType::TIMESTAMP:
+            m_aValue.m_pValue = new DateTime(dbtools::DBTypeConversion::toDateTime(_rVal));
+            break;
+        case DataType::BINARY:
+        case DataType::VARBINARY:
+        case DataType::LONGVARBINARY:
+            OSL_ASSERT("setFromDouble() for this type is not allowed!");
+            break;
+        case DataType::BIT:
+            m_aValue.m_bBool = _rVal != 0.0;
+            break;
+        case DataType::TINYINT:
+            m_aValue.m_nInt8 = sal_Int8(_rVal);
+            break;
+        case DataType::SMALLINT:
+            m_aValue.m_nInt16 = sal_Int16(_rVal);
+            break;
+        case DataType::INTEGER:
+            m_aValue.m_nInt32 = sal_Int32(_rVal);
+            break;
+    }
+    m_eTypeKind = _nDatatype;
+}
+// -------------------------------------------------------------------------
+
+
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
new file mode 100644
index 000000000000..f9f649b49149
--- /dev/null
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -0,0 +1,247 @@
+/*************************************************************************
+ *
+ *  $RCSfile: FDatabaseMetaDataResultSet.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: oj $ $Date: 2001-03-28 11:26:31 $
+ *
+ *  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_FDATABASEMETADATARESULTSET_HXX_
+#define _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
+
+#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
+#include <com/sun/star/sdbc/XRow.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_
+#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_
+#include <com/sun/star/sdbc/XCloseable.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_
+#include <com/sun/star/sdbc/XColumnLocate.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UTIL_XCANCELLABLE_HPP_
+#include <com/sun/star/util/XCancellable.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_
+#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_
+#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_
+#include <com/sun/star/sdbc/XRowUpdate.hpp>
+#endif
+#ifndef _CPPUHELPER_COMPBASE7_HXX_
+#include <cppuhelper/compbase7.hxx>
+#endif
+#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
+#include <comphelper/proparrhlp.hxx>
+#endif
+#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+#include "connectivity/CommonTools.hxx"
+#endif
+#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_
+#include <comphelper/propertycontainer.hxx>
+#endif
+#ifndef _CONNECTIVITY_VALUE_HXX_
+#include "FValue.hxx"
+#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
+
+namespace connectivity
+{
+    class ODatabaseMetaDataResultSetMetaData;
+    typedef ::cppu::WeakComponentImplHelper7<   ::com::sun::star::sdbc::XResultSet,
+                                                ::com::sun::star::sdbc::XRow,
+                                                ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+                                                ::com::sun::star::util::XCancellable,
+                                                ::com::sun::star::sdbc::XWarningsSupplier,
+                                                ::com::sun::star::sdbc::XCloseable,
+                                                ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
+
+    DECLARE_STL_VECTOR(ORowSetValue,ORow);
+    DECLARE_STL_VECTOR(ORow, ORows);
+
+    class ODatabaseMetaDataResultSet :  public comphelper::OBaseMutex,
+                                        public  ODatabaseMetaDataResultSet_BASE,
+                                        public  ::comphelper::OPropertyContainer,
+                                        public  ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
+    {
+
+
+        ORows                           m_aRows;
+        ORowsIterator                   m_aRowsIter;
+        ::com::sun::star::uno::WeakReferenceHelper    m_aStatement;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>        m_xMetaData;
+        sal_Int32                       m_nRowPos;
+        sal_Int32                       m_nColPos;
+
+        sal_Int32                       m_nFetchSize;
+        sal_Int32                       m_nResultSetType;
+        sal_Int32                       m_nFetchDirection;
+        sal_Int32                       m_nResultSetConcurrency;
+
+        sal_Bool                        m_bWasNull;
+        sal_Bool                        m_bBOF;
+
+        void construct();
+
+    protected:
+
+        // OPropertyArrayUsageHelper
+        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
+        // OPropertySetHelper
+        virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
+
+    public:
+        DECLARE_CTY_DEFAULTS(ODatabaseMetaDataResultSet_BASE);
+        // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+        ODatabaseMetaDataResultSet();
+        ~ODatabaseMetaDataResultSet();
+
+        void setRows(const ORows& _rRows) { m_aRows = _rRows; }
+
+        // ::cppu::OComponentHelper
+        virtual void SAL_CALL disposing(void);
+        // XInterface
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        //XTypeProvider
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
+        // XPropertySet
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+        {
+            return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+        }
+        // XResultSet
+        virtual sal_Bool SAL_CALL next(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isAfterLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL beforeFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL afterLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL first(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL last(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL previous(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL refreshRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL rowUpdated(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL rowInserted(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL rowDeleted(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        // XRow
+        virtual sal_Bool SAL_CALL wasNull(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        // XResultSetMetaDataSupplier
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        // XCancellable
+        virtual void SAL_CALL cancel(  ) throw(::com::sun::star::uno::RuntimeException);
+        // XCloseable
+        virtual void SAL_CALL close(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        // XWarningsSupplier
+        virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        // XColumnLocate
+        virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+
+        void setCatalogsMap();
+        void setSchemasMap();
+        void setColumnPrivilegesMap();
+        void setColumnsMap();
+        void setTablesMap();
+        void setTableTypes();
+        void setProcedureColumnsMap();
+        void setProceduresMap();
+        void setExportedKeysMap();
+        void setImportedKeysMap();
+        void setPrimaryKeysMap();
+        void setIndexInfoMap();
+        void setTablePrivilegesMap();
+        void setCrossReferenceMap();
+        void setTypeInfoMap();
+        void setBestRowIdentifierMap();
+        void setVersionColumnsMap();
+    };
+}
+#endif // _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
+
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
new file mode 100644
index 000000000000..be70fcc070a7
--- /dev/null
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -0,0 +1,156 @@
+/*************************************************************************
+ *
+ *  $RCSfile: FDatabaseMetaDataResultSetMetaData.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: oj $ $Date: 2001-03-28 11:26:47 $
+ *
+ *  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_DATABASEMETADATARESULTSETMETADATA_HXX_
+#define _CONNECTIVITY_DATABASEMETADATARESULTSETMETADATA_HXX_
+
+#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HPP_
+#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
+#endif
+#ifndef _CPPUHELPER_IMPLBASE1_HXX_
+#include <cppuhelper/implbase1.hxx>
+#endif
+#ifndef _VECTOR_
+#include <vector>
+#endif
+#ifndef _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
+#include "FDatabaseMetaDataResultSet.hxx"
+#endif
+#ifndef _CONNECTIVITY_COLUMN_HXX_
+#include "OColumn.hxx"
+#endif
+
+namespace connectivity
+{
+    //**************************************************************
+    //************ Class: ODatabaseMetaDataResultSetMetaData
+    //**************************************************************
+    typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData>   ODatabaseMetaResultSetMetaData_BASE;
+
+    class ODatabaseMetaDataResultSetMetaData :  public  ODatabaseMetaResultSetMetaData_BASE
+    {
+        friend class ODatabaseMetaDataResultSet;
+
+        ::std::vector<sal_Int32>                    m_vMapping; // when not every column is needed
+        ::std::map<sal_Int32,connectivity::OColumn> m_mColumns;
+        ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter;
+
+        sal_Int32                                   m_nColCount;
+
+    protected:
+        void setColumnPrivilegesMap();
+        void setColumnsMap();
+        void setTablesMap();
+        void setProcedureColumnsMap();
+        void setPrimaryKeysMap();
+        void setIndexInfoMap();
+        void setTablePrivilegesMap();
+        void setCrossReferenceMap();
+        void setTypeInfoMap();
+        void setProceduresMap();
+        void setTableTypes();
+        void setBestRowIdentifierMap() { setVersionColumnsMap();}
+        void setVersionColumnsMap();
+        void setExportedKeysMap() { setCrossReferenceMap(); }
+        void setImportedKeysMap() { setCrossReferenceMap(); }
+        void setCatalogsMap();
+        void setSchemasMap();
+
+    protected:
+        ~ODatabaseMetaDataResultSetMetaData();
+    public:
+        // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+        ODatabaseMetaDataResultSetMetaData( ODatabaseMetaDataResultSet* _pRes)
+                :   m_nColCount(0)
+        {
+        }
+
+
+        /// Avoid ambigous cast error from the compiler.
+        inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
+        { return this; }
+
+        virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+    };
+}
+#endif // _CONNECTIVITY_FILE_ADATABASEMETARESULTSETMETADATA_HXX_
+
+