diff options
| author | larrybr <larrybr@noemail.net> | 2021-05-19 19:55:10 +0000 |
|---|---|---|
| committer | larrybr <larrybr@noemail.net> | 2021-05-19 19:55:10 +0000 |
| commit | 4f878f33a981786a5bf3db3372a11cf690260de7 (patch) | |
| tree | b8c05ad24cf1596c5b8db1c3b4ae28cfa40ed3d8 /src/expr.c | |
| parent | 3ec4861c000cc5b26520c248043c18299a749d99 (diff) | |
| parent | 1f4f7c7a416801a4e195634b03650191a4a43c7a (diff) | |
| download | sqlite-4f878f33a981786a5bf3db3372a11cf690260de7.tar.gz sqlite-4f878f33a981786a5bf3db3372a11cf690260de7.zip | |
merge from trunk
FossilOrigin-Name: 19ffe3cfe278a4046f32df56f75080c2377e4c44ad40a02d39db8e7701526204
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/expr.c b/src/expr.c index 140260931..7a2df30fd 100644 --- a/src/expr.c +++ b/src/expr.c @@ -95,18 +95,7 @@ Expr *sqlite3ExprAddCollateToken( const Token *pCollName, /* Name of collating sequence */ int dequote /* True to dequote pCollName */ ){ - assert( pExpr!=0 || pParse->db->mallocFailed ); - if( pExpr==0 ) return 0; - if( pExpr->op==TK_VECTOR ){ - ExprList *pList = pExpr->x.pList; - if( ALWAYS(pList!=0) ){ - int i; - for(i=0; i<pList->nExpr; i++){ - pList->a[i].pExpr = sqlite3ExprAddCollateToken(pParse,pList->a[i].pExpr, - pCollName, dequote); - } - } - }else if( pCollName->n>0 ){ + if( pCollName->n>0 ){ Expr *pNew = sqlite3ExprAlloc(pParse->db, TK_COLLATE, pCollName, dequote); if( pNew ){ pNew->pLeft = pExpr; |