diff options
| author | drh <drh@noemail.net> | 2012-12-07 20:31:11 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-12-07 20:31:11 +0000 |
| commit | 7a66da1395eefb5368b7f72439cccf25c4531537 (patch) | |
| tree | 0b6f2281f7f218081e1afa9752fce3b1c766e602 /src/expr.c | |
| parent | 0a8a406e9b5d0549b7c0a169e8af54e2d69b6038 (diff) | |
| download | sqlite-7a66da1395eefb5368b7f72439cccf25c4531537.tar.gz sqlite-7a66da1395eefb5368b7f72439cccf25c4531537.zip | |
Many more tests are passing. Only about 100 failures remain in veryquick.
FossilOrigin-Name: f9fa7581c0371fe0feb4e97487741ade18595810
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index b47752aec..ce6e29578 100644 --- a/src/expr.c +++ b/src/expr.c @@ -112,7 +112,7 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ continue; } if( op==TK_COLLATE ){ - pColl = sqlite3FindCollSeq(db, ENC(db), p->u.zToken, 0); + pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); break; } if( p->pTab!=0 @@ -3129,6 +3129,12 @@ void sqlite3ExplainExpr(Vdbe *pOut, Expr *pExpr){ case TK_ISNULL: zUniOp = "ISNULL"; break; case TK_NOTNULL: zUniOp = "NOTNULL"; break; + case TK_COLLATE: { + sqlite3ExplainExpr(pOut, pExpr->pLeft); + sqlite3ExplainPrintf(pOut,".COLLATE(%s)",pExpr->u.zToken); + break; + } + case TK_AGG_FUNCTION: case TK_CONST_FUNC: case TK_FUNCTION: { |