Index: third_party/sqlite/src/src/where.c |
diff --git a/third_party/sqlite/src/src/where.c b/third_party/sqlite/src/src/where.c |
index bc0110779ea051f46e02c825002686879fffab5d..793b01d1678edeebc90426661e82a05775a6e6a2 100644 |
--- a/third_party/sqlite/src/src/where.c |
+++ b/third_party/sqlite/src/src/where.c |
@@ -1252,7 +1252,7 @@ static void exprAnalyze( |
Expr *pNewExpr2; |
int idxNew1; |
int idxNew2; |
- Token sCollSeqName; /* Name of collating sequence */ |
+ const char *zCollSeqName; /* Name of collating sequence */ |
pLeft = pExpr->x.pList->a[1].pExpr; |
pStr2 = sqlite3ExprDup(db, pStr1, 0); |
@@ -1272,11 +1272,10 @@ static void exprAnalyze( |
} |
*pC = c + 1; |
} |
- sCollSeqName.z = noCase ? "NOCASE" : "BINARY"; |
- sCollSeqName.n = 6; |
+ zCollSeqName = noCase ? "NOCASE" : "BINARY"; |
pNewExpr1 = sqlite3ExprDup(db, pLeft, 0); |
pNewExpr1 = sqlite3PExpr(pParse, TK_GE, |
- sqlite3ExprAddCollateToken(pParse,pNewExpr1,&sCollSeqName), |
+ sqlite3ExprAddCollateString(pParse,pNewExpr1,zCollSeqName), |
pStr1, 0); |
transferJoinMarkings(pNewExpr1, pExpr); |
idxNew1 = whereClauseInsert(pWC, pNewExpr1, TERM_VIRTUAL|TERM_DYNAMIC); |
@@ -1284,7 +1283,7 @@ static void exprAnalyze( |
exprAnalyze(pSrc, pWC, idxNew1); |
pNewExpr2 = sqlite3ExprDup(db, pLeft, 0); |
pNewExpr2 = sqlite3PExpr(pParse, TK_LT, |
- sqlite3ExprAddCollateToken(pParse,pNewExpr2,&sCollSeqName), |
+ sqlite3ExprAddCollateString(pParse,pNewExpr2,zCollSeqName), |
pStr2, 0); |
transferJoinMarkings(pNewExpr2, pExpr); |
idxNew2 = whereClauseInsert(pWC, pNewExpr2, TERM_VIRTUAL|TERM_DYNAMIC); |