| Index: third_party/sqlite/src/src/parse.y
|
| diff --git a/third_party/sqlite/src/src/parse.y b/third_party/sqlite/src/src/parse.y
|
| index 877827e68d7c6478dd949ce1f84ed9ce6b84696c..d888cff92d7f7d9e19916235d769ae2e9ad38541 100644
|
| --- a/third_party/sqlite/src/src/parse.y
|
| +++ b/third_party/sqlite/src/src/parse.y
|
| @@ -854,7 +854,7 @@ expr(A) ::= VARIABLE(X). {
|
| spanSet(&A, &X, &X);
|
| }
|
| expr(A) ::= expr(E) COLLATE ids(C). {
|
| - A.pExpr = sqlite3ExprAddCollateToken(pParse, E.pExpr, &C);
|
| + A.pExpr = sqlite3ExprAddCollateToken(pParse, E.pExpr, &C, 1);
|
| A.zStart = E.zStart;
|
| A.zEnd = &C.z[C.n];
|
| }
|
| @@ -1200,14 +1200,14 @@ uniqueflag(A) ::= . {A = OE_None;}
|
| idxlist_opt(A) ::= . {A = 0;}
|
| idxlist_opt(A) ::= LP idxlist(X) RP. {A = X;}
|
| idxlist(A) ::= idxlist(X) COMMA nm(Y) collate(C) sortorder(Z). {
|
| - Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &C);
|
| + Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &C, 1);
|
| A = sqlite3ExprListAppend(pParse,X, p);
|
| sqlite3ExprListSetName(pParse,A,&Y,1);
|
| sqlite3ExprListCheckLength(pParse, A, "index");
|
| if( A ) A->a[A->nExpr-1].sortOrder = (u8)Z;
|
| }
|
| idxlist(A) ::= nm(Y) collate(C) sortorder(Z). {
|
| - Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &C);
|
| + Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &C, 1);
|
| A = sqlite3ExprListAppend(pParse,0, p);
|
| sqlite3ExprListSetName(pParse, A, &Y, 1);
|
| sqlite3ExprListCheckLength(pParse, A, "index");
|
|
|