Tag: cws_src680_dba24c User: fs Date: 2007-09-18 20:04:53+0000 Modified: dba/connectivity/inc/connectivity/IParseContext.hxx dba/connectivity/inc/connectivity/sqlparse.hxx dba/connectivity/inc/connectivity/dbexception.hxx
Log: during #i81095#: outsourced the CYCLIC_SUB_QUERIES error to the new css.sdb.ErrorCondition File Changes: Directory: /dba/connectivity/inc/connectivity/ ============================================== File [changed]: IParseContext.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/IParseContext.hxx?r1=1.5&r2=1.5.138.1 Delta lines: +4 -5 ------------------- --- IParseContext.hxx 2006-08-28 14:51:15+0000 1.5 +++ IParseContext.hxx 2007-09-18 20:04:51+0000 1.5.138.1 @@ -4,9 +4,9 @@ * * $RCSfile: IParseContext.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.138.1 $ * - * last change: $Author: ihi $ $Date: 2006/08/28 14:51:15 $ + * last change: $Author: fs $ $Date: 2007/09/18 20:04:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,8 +67,7 @@ ERROR_INVALID_TABLE_OR_QUERY, // "The database does contain neither a table nor a query named \"#\"." ERROR_INVALID_COLUMN, // "The column \"#1\" is unknown in the table \"#2\"." ERROR_INVALID_TABLE_EXIST, // "The database already contains a table or view with name \"#\"." - ERROR_INVALID_QUERY_EXIST, // "The database already contains a query with name \"#\"."; - ERROR_CYCLIC_SUB_QUERIES // "The statement contains a cyclic reference to one or more sub queries." + ERROR_INVALID_QUERY_EXIST // "The database already contains a query with name \"#\"."; }; enum InternationalKeyCode File [changed]: sqlparse.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sqlparse.hxx?r1=1.21&r2=1.21.54.1 Delta lines: +10 -4 -------------------- --- sqlparse.hxx 2007-04-11 12:35:02+0000 1.21 +++ sqlparse.hxx 2007-09-18 20:04:51+0000 1.21.54.1 @@ -4,9 +4,9 @@ * * $RCSfile: sqlparse.hxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.21.54.1 $ * - * last change: $Author: vg $ $Date: 2007/04/11 12:35:02 $ + * last change: $Author: fs $ $Date: 2007/09/18 20:04:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,6 +92,7 @@ namespace connectivity { class OSQLScanner; + class SQLError; //========================================================================== //= OParseContext @@ -131,6 +132,7 @@ //========================================================================== //= OSQLParser //========================================================================== + struct OSQLParser_Data; /** Parser for SQL92 */ class OSQLParser @@ -155,7 +157,8 @@ // informations on the current parse action const IParseContext* m_pContext; OSQLParseNode* m_pParseTree; // result from parsing - ::com::sun::star::lang::Locale* m_pLocale; // current locale settings for parsing + ::std::auto_ptr< OSQLParser_Data > + m_pData; ::rtl::OUString m_sFieldName; // current field name for a predicate ::rtl::OUString m_sErrorMessage;// current error msg @@ -201,6 +204,9 @@ // Access to the context const IParseContext& getContext() const {return *m_pContext;} + /// access to the SQLError instance owned by this parser + const SQLError& getErrorHelper() const; + // TokenIDToStr: Token-Name zu einer Token-Nr. static ::rtl::OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL); File [changed]: dbexception.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/dbexception.hxx?r1=1.17&r2=1.17.98.1 Delta lines: +3 -5 ------------------- --- dbexception.hxx 2006-12-01 16:49:28+0000 1.17 +++ dbexception.hxx 2007-09-18 20:04:51+0000 1.17.98.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbexception.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.98.1 $ * - * last change: $Author: rt $ $Date: 2006/12/01 16:49:28 $ + * last change: $Author: fs $ $Date: 2007/09/18 20:04:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -93,8 +93,6 @@ SQL_FUNCTION_NOT_SUPPORTED, // IM001 SQL_CONNECTION_DOES_NOT_EXIST, // 08003 - SQL_CYCLIC_SUB_QUERIES, // OB001 - SQL_ERROR_UNSPECIFIED = SAL_MAX_ENUM // special value indicating that an SQLState is not to be specified }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
