diff options
author | drh <drh@noemail.net> | 2014-01-16 21:59:51 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2014-01-16 21:59:51 +0000 |
commit | 727a99f1e313adecf162cf7c3199cc496d87099e (patch) | |
tree | 5f12b6eb41fe91c76edd908badb1de070e9a952d /src/select.c | |
parent | f2655fe8b68be84a471389f0face897c82b02082 (diff) | |
download | sqlite-727a99f1e313adecf162cf7c3199cc496d87099e.tar.gz sqlite-727a99f1e313adecf162cf7c3199cc496d87099e.zip |
Tweaks to error message text.
FossilOrigin-Name: 090a77d97808b86d1e9f5c63c743a2b159a15f5d
Diffstat (limited to 'src/select.c')
-rw-r--r-- | src/select.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/select.c b/src/select.c index 7b6c5e9c2..ae2e0ce65 100644 --- a/src/select.c +++ b/src/select.c @@ -3609,20 +3609,20 @@ static int withExpand( /* Only one recursive reference is permitted. */ if( pTab->nRef>2 ){ sqlite3ErrorMsg( - pParse, "multiple recursive references in cte: %s", pCte->zName + pParse, "multiple references to recursive table: %s", pCte->zName ); return WRC_Abort; } assert( pTab->nRef==1 || ((pSel->selFlags&SF_Recursive) && pTab->nRef==2 )); - pCte->zErr = "circular reference to cte: %s"; + pCte->zErr = "circular reference: %s"; sqlite3WalkSelect(pWalker, bMayRecursive ? pSel->pPrior : pSel); for(pLeft=pSel; pLeft->pPrior; pLeft=pLeft->pPrior); pEList = pLeft->pEList; if( pCte->pCols ){ if( pEList->nExpr!=pCte->pCols->nExpr ){ - sqlite3ErrorMsg(pParse, "cte \"%s\" returns %d values for %d columns", + sqlite3ErrorMsg(pParse, "table %s has %d values for %d columns", pCte->zName, pEList->nExpr, pCte->pCols->nExpr ); return WRC_Abort; @@ -3633,9 +3633,9 @@ static int withExpand( if( bMayRecursive ){ if( pSel->selFlags & SF_Recursive ){ - pCte->zErr = "multiple recursive references in cte: %s"; + pCte->zErr = "multiple recursive references: %s"; }else{ - pCte->zErr = "recursive reference may not appear in sub-query: %s"; + pCte->zErr = "recursive reference in a subquery: %s"; } sqlite3WalkSelect(pWalker, pSel); } |