commit 9f24b53dcccf022ee9290f7c38872e288b1eaaa3
author drh <drh@noemail.net> Mon Sep 05 22:50:48 2016 +0000
committer drh <drh@noemail.net> Mon Sep 05 22:50:48 2016 +0000
tree 68ca66cfd651aa5bce63a96a4a1aaa974ad6f0f8
parent c1bcd9cc3e9913acec4d8b04178d52826f82eb2d

Simplified logic to extract a column from a row value.

FossilOrigin-Name: e8f105c3009e9b667db2afc0088b020a2b94d370

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 517034c..a21ca05 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -371,9 +371,8 @@
 Expr *sqlite3VectorFieldSubexpr(Expr *pVector, int i){
   assert( i<sqlite3ExprVectorSize(pVector) );
   if( sqlite3ExprIsVector(pVector) ){
-    if( pVector->op==TK_SELECT
-     || (pVector->op==TK_REGISTER && pVector->op2==TK_SELECT)
-    ){
+    assert( pVector->op2==0 || pVector->op==TK_REGISTER );
+    if( pVector->op==TK_SELECT || pVector->op2==TK_SELECT ){
       return pVector->x.pSelect->pEList->a[i].pExpr;
     }else{
       return pVector->x.pList->a[i].pExpr;