diff options
| author | drh <drh@noemail.net> | 2012-12-07 22:54:41 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-12-07 22:54:41 +0000 |
| commit | 62a66e70344aaca4e8d7e79eecd8d63b4bab9b09 (patch) | |
| tree | 208a898fd1047484d6ab997a2ef5e98b5b81804a /src/expr.c | |
| parent | 953f7611da21d43454ae5173f5fb1b69465a2d45 (diff) | |
| download | sqlite-62a66e70344aaca4e8d7e79eecd8d63b4bab9b09.tar.gz sqlite-62a66e70344aaca4e8d7e79eecd8d63b4bab9b09.zip | |
Do not report missing collating functions while parsing the schema.
Also remove a stray comment.
FossilOrigin-Name: e313edca0472f07e9b872b92120d80b4bc177328
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index ce6e29578..0e4a3cb1f 100644 --- a/src/expr.c +++ b/src/expr.c @@ -112,7 +112,12 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ continue; } if( op==TK_COLLATE ){ - pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); + if( db->init.busy ){ + /* Do not report errors when parsing while the schema */ + pColl = sqlite3FindCollSeq(db, ENC(db), p->u.zToken, 0); + }else{ + pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); + } break; } if( p->pTab!=0 |