diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.c | 2 | ||||
| -rw-r--r-- | src/select.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/build.c b/src/build.c index 353c93807..fa7364c3d 100644 --- a/src/build.c +++ b/src/build.c @@ -4222,7 +4222,7 @@ With *sqlite3WithAdd( int i; for(i=0; i<pWith->nCte; i++){ if( sqlite3StrICmp(zName, pWith->a[i].zName)==0 ){ - sqlite3ErrorMsg(pParse, "duplicate cte name: %s", zName); + sqlite3ErrorMsg(pParse, "duplicate WITH table name: %s", zName); } } } 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); } |