#i3289# correct table name quoting so that in every situation the correct schema, catalog is used

2 files changed, 60 insertions, 5 deletions

diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index b271c3796046..c3df4bf8d7c4 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: staticdbtools_s.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-06 14:50:00 $
+ *  last change: $Author: oj $ $Date: 2002-10-07 12:48:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,6 +154,14 @@ namespace connectivity
         return ::dbtools::calcConnection(_rxRowSet, _rxFactory);
     }
 
+    // ------------------------------------------------
+    Reference< XConnection> ODataAccessStaticTools::getRowSetConnection(
+                const Reference< XRowSet>& _rxRowSet)
+                const SAL_THROW ( (RuntimeException) )
+    {
+        return ::dbtools::getConnection(_rxRowSet);
+    }
+
     //----------------------------------------------------------------
     Reference< XNumberFormatsSupplier> ODataAccessStaticTools::getNumberFormats(const Reference< XConnection>& _rxConn, sal_Bool _bAllowDefault) const
     {
@@ -182,7 +190,7 @@ namespace connectivity
     //----------------------------------------------------------------
     ::rtl::OUString ODataAccessStaticTools::quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta, const ::rtl::OUString& _rName) const
     {
-        return ::dbtools::quoteTableName(_rxMeta, _rName);
+        return ::dbtools::quoteTableName(_rxMeta, _rName,::dbtools::eInDataManipulation);
     }
 
     //----------------------------------------------------------------
@@ -198,6 +206,24 @@ namespace connectivity
         return ::dbtools::getDataSource( _rsRegisteredName, _rxFactory );
     }
 
+    //----------------------------------------------------------------
+    sal_Bool ODataAccessStaticTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const
+    {
+        return ::dbtools::canInsert( _rxCursorSet );
+    }
+
+    //----------------------------------------------------------------
+    sal_Bool ODataAccessStaticTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const
+    {
+        return ::dbtools::canUpdate( _rxCursorSet );
+    }
+
+    //----------------------------------------------------------------
+    sal_Bool ODataAccessStaticTools::canDelete(const Reference< XPropertySet>& _rxCursorSet) const
+    {
+        return ::dbtools::canDelete( _rxCursorSet );
+    }
+
 //........................................................................
 }   // namespace connectivity
 //........................................................................
@@ -205,6 +231,9 @@ namespace connectivity
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.2  2001/08/06 14:50:00  fs
+ *  #87690# +connectRowset / some other methods needed later on (to make writer link-time independent og dbtools)
+ *
  *  Revision 1.1  2001/07/25 13:30:10  fs
  *  initial checkin - class for load-on-demand usage of the statis DBTOOLS helper functions
  *
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index 9f156e166509..2d25ebc56540 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: staticdbtools_s.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-06 14:50:00 $
+ *  last change: $Author: oj $ $Date: 2002-10-07 12:48:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,6 +134,11 @@ namespace connectivity
         ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) );
 
         // ------------------------------------------------
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet)
+                const SAL_THROW ( (::com::sun::star::uno::RuntimeException) );
+
+        // ------------------------------------------------
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
             sal_Bool _bAllowDefault
@@ -179,6 +184,24 @@ namespace connectivity
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
         ) const;
 
+        // ------------------------------------------------
+        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
+            @param      _rxCursorSet    the property set
+        */
+        virtual sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+
+        // ------------------------------------------------
+        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
+            @param      _rxCursorSet    the property set
+        */
+        virtual sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+
+        // ------------------------------------------------
+        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
+            @param      _rxCursorSet    the property set
+        */
+        virtual sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+
         // disambiguate IReference
         // ------------------------------------------------
         virtual oslInterlockedCount SAL_CALL acquire();
@@ -194,6 +217,9 @@ namespace connectivity
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.2  2001/08/06 14:50:00  fs
+ *  #87690# +connectRowset / some other methods needed later on (to make writer link-time independent og dbtools)
+ *
  *  Revision 1.1  2001/07/25 13:30:17  fs
  *  initial checkin - class for load-on-demand usage of the statis DBTOOLS helper functions
  *