mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modifications to add support for more SQL statements.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@634 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-07-05 15:25:36 +00:00
parent d60f9efd0c
commit 30bd367a3d
24 changed files with 4222 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/src/sqloptimize.cpp
View File

@@ -2397,7 +2397,7 @@ RCODE SQLQuery::optimizeTable(
SQL_NODE * pOperand;
SQL_PRED * pPred;
void * pvMark = m_pool.poolMark();
SQLTableCursor * pSQLTableCursor = NULL;
SQLTableCursor * pSQLTableCursor = NULL;
// This routine should not be called if the table has already been
// marked to do a table scan.
@@ -2663,16 +2663,13 @@ RCODE SQLQuery::optimize( void)
// Make sure we have a completed expression
if (m_pCurrParseState)
if (!criteriaIsComplete())
{
rc = RC_SET( NE_SFLM_Q_INCOMPLETE_QUERY_EXPR);
goto Exit;
}
else if (m_pCurrParseState)
{
if (m_pCurrParseState->pPrev ||
m_pCurrParseState->uiNestLevel ||
(m_pCurrParseState->pLastNode &&
m_pCurrParseState->pLastNode->eNodeType == FLM_OPERATOR_NODE))
{
rc = RC_SET( NE_SFLM_Q_INCOMPLETE_QUERY_EXPR);
goto Exit;
}
m_pQuery = m_pCurrParseState->pRootNode;
}