dba33f: #i108548# extend SingleSelectQueryComposer appendFilterByColumn with additonal parameter

2 files changed, 38 insertions, 4 deletions

diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index ed653df96f8d..dc484ee6d970 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -222,6 +222,36 @@ interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
     */
     string getQueryWithSubstitution()
         raises (com::sun::star::sdbc::SQLException);
+
+    /** sets a new query for the composer, which may be expanded by filters, group by, having
+        and sort criteria.
+        @param Command
+            is the command which should be executed, the type of command depends
+            on the CommandType.
+
+            <p>In case of a <member>CommandType</member> of <member>CommandType::COMMAND</member>,
+            means in case the <member>Command</member> specifies an SQL statement, the inherited
+            <member scope="com::sun::star::sdbc">RowSet::EscapeProcessing</member>
+            becomes relevant:<br/>
+            It then can be to used to specify whether the SQL statement should be analyzed on the
+            client side before sending it to the database server.<br/>
+            The default value for <member scope="com::sun::star::sdbc">RowSet::EscapeProcessing</member>
+            is <TRUE/>. By switching it to <FALSE/>, you can pass backend-specific SQL statements,
+            which are not standard SQL, to your database.</p>
+
+            @see com::sun::star::sdb::CommandType
+            @see com::sun::star::sdbc::RowSet::EscapeProcessing
+        @param  CommandType
+            is the type of the command.
+            @see com::sun::star::sdb::CommandType
+        @throws com::sun::star::sdbc::SQLException
+            if a database access error occurs
+            or the statement isn't a single select statement
+            or the statement isn't valid
+            or the statement can not be parsed.
+     */
+    void setCommand([in] string Command ,[in] long CommandType)
+            raises (com::sun::star::sdbc::SQLException);
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index 53a469dfcead..94ae5f9e3cd8 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -99,14 +99,16 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
         The value property must be supported by the <type scope="com::sun::star::sdb">DataColumn</type>.
         @param column
             the column which is used to create a filter
-        @paran  andCriteria
+        @param  andCriteria
             If <TRUE/> the filter condition will be appended as an AND condition, otherwise
             the new filter condition will be appended as OR criteria.
             E.g. (xx AND bb AND cc) OR newCriteria
+        @param  filterOperator
+            The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
         @throws com::sun::star::sdbc::SQLException
             if a database access error occurs.
      */
-    void appendFilterByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria)
+    void appendFilterByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria,[in] long filterOperator)
             raises (com::sun::star::sdbc::SQLException);
 
     //-------------------------------------------------------------------------
@@ -173,14 +175,16 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
         providing the name and the value for the filter.
         @param column
             the column which is used to create a filter
-        @paran  andCriteria
+        @param  andCriteria
             If <TRUE/> the filter condition will be appended as an AND condition, otherwise
             the new filter condition will be appended as OR criteria.
             E.g. (xx AND bb AND cc) OR newCriteria
+        @param  filterOperator
+            The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
         @throws com::sun::star::sdbc::SQLException
             if a database access error occurs.
      */
-    void appendHavingClauseByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria)
+    void appendHavingClauseByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria,[in] long filterOperator)
             raises (com::sun::star::sdbc::SQLException);
 
     //-------------------------------------------------------------------------