User: obo     
Date: 2006/07/10 08:03:27

Modified:
   dba/dbaccess/source/core/api/RowSet.hxx

Log:
 INTEGRATION: CWS qiq (1.42.60); FILE MERGED
 2006/06/27 11:54:31 fs 1.42.60.4: RESYNC: (1.42-1.43); FILE MERGED
 2006/06/16 13:35:23 fs 1.42.60.3: m_xAnalyzer is superfluous
 2006/06/09 11:57:45 fs 1.42.60.2: #i51143# when executing, and an error 
occurs, append an info stating the (original) statement which lead to this error
 2006/05/10 10:54:59 fs 1.42.60.1: #i51443# allow executing queries which are 
based on other queries

File Changes:

Directory: /dba/dbaccess/source/core/api/
=========================================

File [changed]: RowSet.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.hxx?r1=1.43&r2=1.44
Delta lines:  +34 -4
--------------------
--- RowSet.hxx  20 Jun 2006 02:35:46 -0000      1.43
+++ RowSet.hxx  10 Jul 2006 15:03:25 -0000      1.44
@@ -124,7 +124,6 @@
                ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >    m_xTypeMap;
                ::com::sun::star::uno::Any                                      
                                                                        
m_aTypeMap;
                ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XPreparedStatement >  m_xStatement;
-               ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::XSingleSelectQueryAnalyzer >   m_xAnalyzer;
                ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::XSingleSelectQueryComposer >   m_xComposer;
                ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >    m_xColumns; // the columns from a 
table or query
 
@@ -172,9 +171,40 @@
                sal_Bool                                        
m_bOwnConnection;
 
        private:
+        /** retrieves the composed SQL query to be used for preparing an SQL 
statement at the connection
+
+            The query is built from our active command plus our current 
filter/order criterions.
+
+            @param _bForExecution
+                <TRUE/> if this is for executing the statement (then 
XSingleSelectQueryAnalyzer::getQueryWithSubstitution will be
+                used), or <FALSE/> if it's for presentation to the user, e.g. 
in an error message (then
+                XSingleSelectQueryAnalyzer::getQuery will be used).
+
+            @precond
+                m_xActiveConnection points to a valid SDB-level connection
+
+            @throws com::sun::star::sdb::SQLException
+                if an database-related error occured
+            @throws com::sun::star::uno::RuntimeException
+                if any of the components involved throws a 
com::sun::star::uno::RuntimeException
+        */
+        ::rtl::OUString impl_getComposedQuery_throw( bool _bForExecution );
+
+        /** builds m_aActiveCommand from our settings
+
+            @return
+                whether we should use escape processing before executing the 
actual command. This is determined
+                from our own EscapeProcessing property, and possibly overruled 
by the respective property
+                of a query we're based on.
+        */
+        sal_Bool        impl_buildActiveCommand_throw();
+
+        /** prepares and executes our command
+        */
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
+                        impl_prepareAndExecute_throw();
+
                ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XConnection >  calcConnection(const 
::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler 
>& _rxHandler) throw( ::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException );
-               rtl::OUString getComposedQuery(const rtl::OUString& rQuery, 
sal_Bool bEscapeProcessing,::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >& _rxRetTables) throw( 
::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-               rtl::OUString getCommand(sal_Bool& 
bEscapeProcessing,::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >& _rxRetTables) throw( 
::com::sun::star::sdbc::SQLException);
                // free clones and ParseTree
                void freeResources();
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to