diff options
| author | drh <drh@noemail.net> | 2009-04-22 17:15:02 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2009-04-22 17:15:02 +0000 |
| commit | 044925be0b82dc7d6712e18559f5c8b9c4d99dbe (patch) | |
| tree | ffb845314c70bedb3ece04b91a19c0982cca2a53 /src/expr.c | |
| parent | 6149526c25b64d1ab1b31fd024956caa989a0fb5 (diff) | |
| download | sqlite-044925be0b82dc7d6712e18559f5c8b9c4d99dbe.tar.gz sqlite-044925be0b82dc7d6712e18559f5c8b9c4d99dbe.zip | |
Eliminate the OP_VRowid opcode. The regular OP_Rowid now work for both
regular and virtual tables. (CVS 6537)
FossilOrigin-Name: ecbef45011f1f98d940b2d3492941213d9f04172
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index 35a585377..b7d30412b 100644 --- a/src/expr.c +++ b/src/expr.c @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: expr.c,v 1.426 2009/04/08 13:51:51 drh Exp $ +** $Id: expr.c,v 1.427 2009/04/22 17:15:03 drh Exp $ */ #include "sqliteInt.h" @@ -1745,8 +1745,7 @@ int sqlite3ExprCodeGetColumn( } assert( v!=0 ); if( iColumn<0 ){ - int op = (pTab && IsVirtual(pTab)) ? OP_VRowid : OP_Rowid; - sqlite3VdbeAddOp2(v, op, iTable, iReg); + sqlite3VdbeAddOp2(v, OP_Rowid, iTable, iReg); }else if( pTab==0 ){ sqlite3VdbeAddOp3(v, OP_Column, iTable, iColumn, iReg); }else{ |