diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:40:08 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:40:08 +0000 |
| commit | d6952442ae09d64739769a6aa33b8230e8693b1d (patch) | |
| tree | ef58b83cb77f526d78d222d56a260078e9967a2a | |
| parent | 2c3baefc6563ca539cc5bf665eed33e81d1f16c7 (diff) | |
INTEGRATION: CWS qiq (1.9.104); FILE MERGED
2006/05/23 13:54:28 fs 1.9.104.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143#
| -rw-r--r-- | connectivity/source/simpledbt/staticdbtools_s.cxx | 16 | ||||
| -rw-r--r-- | connectivity/source/simpledbt/staticdbtools_s.hxx | 18 |
2 files changed, 22 insertions, 12 deletions
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx index aeb376e23278..8dbb7f4590c2 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.cxx +++ b/connectivity/source/simpledbt/staticdbtools_s.cxx @@ -4,9 +4,9 @@ * * $RCSfile: staticdbtools_s.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-08 07:48:54 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:39:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -156,11 +156,15 @@ namespace connectivity } //---------------------------------------------------------------- - ::rtl::OUString ODataAccessStaticTools::quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta, const ::rtl::OUString& _rName - , sal_Bool _bUseCatalogInSelect - , sal_Bool _bUseSchemaInSelect) const + ::rtl::OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName ) const { - return ::dbtools::quoteTableName(_rxMeta, _rName,::dbtools::eInDataManipulation,_bUseCatalogInSelect,_bUseSchemaInSelect); + return ::dbtools::composeTableNameForSelect( _rxConnection, _rCatalog, _rSchema, _rName ); + } + + //---------------------------------------------------------------- + ::rtl::OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const + { + return ::dbtools::composeTableNameForSelect( _rxConnection, _xTable ); } //---------------------------------------------------------------- diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx index ef9b720a15f9..515255782a47 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.hxx +++ b/connectivity/source/simpledbt/staticdbtools_s.hxx @@ -4,9 +4,9 @@ * * $RCSfile: staticdbtools_s.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-08 07:49:13 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:40:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -135,11 +135,17 @@ namespace connectivity ) const; // ------------------------------------------------ - virtual ::rtl::OUString quoteTableName( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta, + virtual ::rtl::OUString composeTableNameForSelect( + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const ::rtl::OUString& _rCatalog, + const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName - , sal_Bool _bUseCatalogInSelect = sal_True - , sal_Bool _bUseSchemaInSelect = sal_True + ) const; + + // ------------------------------------------------ + virtual ::rtl::OUString composeTableNameForSelect( + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ) const; // ------------------------------------------------ |