diff options
| author | dan <Dan Kennedy> | 2023-08-10 17:07:34 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2023-08-10 17:07:34 +0000 |
| commit | 6de6121e36e33d214c5f19e9197f7cee0fb60d7f (patch) | |
| tree | 165e77da459e2813194b6b46c96be7d2e47f62c3 /src/expr.c | |
| parent | 9a897cb0dea3fe2aa17e2b1d1155fe016447fa76 (diff) | |
| parent | 80c438613a687d41ce820f113a2b20e1aade93a6 (diff) | |
| download | sqlite-6de6121e36e33d214c5f19e9197f7cee0fb60d7f.tar.gz sqlite-6de6121e36e33d214c5f19e9197f7cee0fb60d7f.zip | |
Merge latest trunk changes into this branch.
FossilOrigin-Name: 3ed89c344fcb3b7ee8b764d95144643e42e053e1116150d6eda8355fbd6669df
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/expr.c b/src/expr.c index 0c41f6684..d96f36285 100644 --- a/src/expr.c +++ b/src/expr.c @@ -3972,10 +3972,13 @@ int sqlite3ExprCodeGetColumn( u8 p5 /* P5 value for OP_Column + FLAGS */ ){ assert( pParse->pVdbe!=0 ); + assert( (p5 & (OPFLAG_NOCHNG|OPFLAG_TYPEOFARG|OPFLAG_LENGTHARG))==p5 ); + assert( IsVirtual(pTab) || (p5 & OPFLAG_NOCHNG)==0 ); sqlite3ExprCodeGetColumnOfTable(pParse->pVdbe, pTab, iTable, iColumn, iReg); if( p5 ){ VdbeOp *pOp = sqlite3VdbeGetLastOp(pParse->pVdbe); if( pOp->opcode==OP_Column ) pOp->p5 = p5; + if( pOp->opcode==OP_VColumn ) pOp->p5 = (p5 & OPFLAG_NOCHNG); } return iReg; } |