aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c7
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