diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/expr.c | 1 | ||||
-rw-r--r-- | src/vdbe.c | 4 | ||||
-rw-r--r-- | src/vdbeaux.c | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index 78bb0c2eb..f5916c53e 100644 --- a/src/expr.c +++ b/src/expr.c @@ -3748,6 +3748,7 @@ void sqlite3ExprCodeGetColumnOfTable( } if( iCol<0 || iCol==pTab->iPKey ){ sqlite3VdbeAddOp2(v, OP_Rowid, iTabCur, regOut); + VdbeComment((v, "%s.rowid", pTab->zName)); }else{ int op; int x; diff --git a/src/vdbe.c b/src/vdbe.c index 092ccbcd1..16b6f9bb5 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -2659,7 +2659,7 @@ case OP_Offset: { /* out3 */ #endif /* SQLITE_ENABLE_OFFSET_SQL_FUNC */ /* Opcode: Column P1 P2 P3 P4 P5 -** Synopsis: r[P3]=PX +** Synopsis: r[P3]=PX cursor P1 column P2 ** ** Interpret the data that cursor P1 points to as a structure built using ** the MakeRecord instruction. (See the MakeRecord opcode for additional @@ -5742,7 +5742,7 @@ case OP_RowData: { } /* Opcode: Rowid P1 P2 * * * -** Synopsis: r[P2]=rowid +** Synopsis: r[P2]=PX rowid of P1 ** ** Store in register P2 an integer which is the key of the table entry that ** P1 is currently point to. diff --git a/src/vdbeaux.c b/src/vdbeaux.c index cb2433c2c..a67bc68f9 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -1490,8 +1490,13 @@ char *sqlite3VdbeDisplayComment( if( c=='4' ){ sqlite3_str_appendall(&x, zP4); }else if( c=='X' ){ - sqlite3_str_appendall(&x, pOp->zComment); + if( pOp->zComment && pOp->zComment[0] ){ + sqlite3_str_appendall(&x, pOp->zComment); + }else{ + sqlite3_str_appendall(&x, zSynopsis+1); + } seenCom = 1; + break; }else{ int v1 = translateP(c, pOp); int v2; |