User: ihi Date: 2007-11-21 15:08:57+0000 Modified: dba/connectivity/source/parse/sqlbison.y
Log: INTEGRATION: CWS dba24c (1.57.18); FILE MERGED 2007/10/29 22:12:34 fs 1.57.18.4: merging changes from CWS dba24b herein, to not wait for later resync 2007/09/28 22:04:18 fs 1.57.18.3: #i10000# 2007/09/28 19:17:51 fs 1.57.18.2: RESYNC: (1.57-1.58); FILE MERGED 2007/09/18 20:05:25 fs 1.57.18.1: during #i81095#: outsourced the CYCLIC_SUB_QUERIES error to the new css.sdb.ErrorCondition File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqlbison.y Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlbison.y?r1=1.59&r2=1.60 Delta lines: +0 -25 -------------------- --- sqlbison.y 2007-11-01 14:52:06+0000 1.59 +++ sqlbison.y 2007-11-21 15:08:54+0000 1.60 @@ -3139,7 +3139,6 @@ IMPLEMENT_CONSTASCII_STRING(ERROR_STR_INVALID_COLUMN, "The column \"#1\" is unknown in the table \"#2\"."); IMPLEMENT_CONSTASCII_STRING(ERROR_STR_INVALID_TABLE_EXIST, "The database already contains a table or view with name \"#\"."); IMPLEMENT_CONSTASCII_STRING(ERROR_STR_INVALID_QUERY_EXIST, "The database already contains a query with name \"#\"."); -IMPLEMENT_CONSTASCII_STRING(ERROR_STR_CYCLIC_SUB_QUERIES, "The statement contains a cyclic reference to one or more sub queries."); IMPLEMENT_CONSTASCII_STRING(KEY_STR_LIKE, "LIKE"); IMPLEMENT_CONSTASCII_STRING(KEY_STR_NOT, "NOT"); @@ -3191,7 +3190,6 @@ case ERROR_INVALID_COLUMN: aMsg = ERROR_STR_INVALID_COLUMN; break; case ERROR_INVALID_TABLE_EXIST: aMsg = ERROR_STR_INVALID_TABLE_EXIST; break; case ERROR_INVALID_QUERY_EXIST: aMsg = ERROR_STR_INVALID_QUERY_EXIST; break; - case ERROR_CYCLIC_SUB_QUERIES: aMsg = ERROR_STR_CYCLIC_SUB_QUERIES; break; default: OSL_ENSURE( false, "OParseContext::getErrorMessage: unknown error code!" ); break; @@ -3343,29 +3341,6 @@ { xxx_pGLOBAL_SQLPARSER = _pParser; } -//----------------------------------------------------------------------------- -OSQLParser::~OSQLParser() -{ - { - ::osl::MutexGuard aGuard(getMutex()); - OSL_ENSURE(s_nRefCount > 0, "OSQLParser::~OSQLParser() : suspicious call : have a refcount of 0 !"); - if (!--s_nRefCount) - { - s_pScanner->setScanner(sal_True); - delete s_pScanner; - s_pScanner = NULL; - - delete s_pGarbageCollector; - s_pGarbageCollector = NULL; - // is only set the first time so we should delete it only when there no more instances - s_xLocaleData = NULL; - - RuleIDMap aEmpty; - s_aReverseRuleIDLookup.swap( aEmpty ); - } - m_pParseTree = NULL; - } -} // ------------------------------------------------------------------------- void OSQLParser::setParseTree(OSQLParseNode * pNewParseTree) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
