aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2019-10-24 23:43:32 +0000
committerdrh <drh@noemail.net>2019-10-24 23:43:32 +0000
commit1b22c1b8168ce18d5582fc0004369ecef8f7d939 (patch)
tree4f5bf83ec8a662c52d05cbfbd5c71d8384c2f208 /src/expr.c
parent4485ac1a25e9919b5911a0db2ad7bed58be143d6 (diff)
parentef2df8f3435edb6ad260ab6ebbf0f151bf0a2a48 (diff)
downloadsqlite-1b22c1b8168ce18d5582fc0004369ecef8f7d939.tar.gz
sqlite-1b22c1b8168ce18d5582fc0004369ecef8f7d939.zip
Merge fixes from trunk.
FossilOrigin-Name: 4ec57d88415fa4ea2e99d4a5671074ec6829d6824bc8509d5ae9c978d47d1419
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/expr.c b/src/expr.c
index 0eb7af7f4..4ae687662 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -175,6 +175,10 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){
p = p->pLeft;
continue;
}
+ if( op==TK_VECTOR ){
+ p = p->x.pList->a[0].pExpr;
+ continue;
+ }
if( op==TK_COLLATE ){
pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken);
break;