Improved comment field in the bytecode generated for OP_Column and OP_Rowid.

FossilOrigin-Name: 1b2c5cef9560123344db391cd065090d1914724715ec6643d2d9b5fac2051a21

diff --git a/manifest b/manifest
index 375c4eca3648ed582be9c77933345ac82294a50e..275be40dfb48ce50e53eb68dcc73d8feba7c8b6b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sshell\sauto-column\swork\swith\slots\sof\scolumns\swhen\slog()\sis\smissing.
-D 2022-04-16T17:53:25.671
+C Improved\scomment\sfield\sin\sthe\sbytecode\sgenerated\sfor\sOP_Column\sand\sOP_Rowid.
+D 2022-04-18T14:15:07.659
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -503,7 +503,7 @@ F src/date.c 15082566229d4b1e5f24fdb490bf9bcc68824b911d70e3573ef075a1b9e2d26f
 F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
-F src/expr.c 38a25dcba22bc6c9d8614e64624497aab1762911ba88e81fc55f1e67a85ebc16
+F src/expr.c 1d9a1eefd803c9f9b1cfed9015589157de173e0994b7a73e2d9cf5a267a77449
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
 F src/func.c a3407a6fbb0d4088d8d502e46f0ace63e0aeae7467ae23a9ca9815bbf9239761
@@ -624,11 +624,11 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
-F src/vdbe.c 841057c12c1c4e2dcc7e51516a06aabb72d9898ab50484edef162b9218da65b0
+F src/vdbe.c e82071ff183d3cf9aa3afeefc40f10a2443e8056e16c38f6d80e041da7ec3fb2
 F src/vdbe.h 89f5edb1422c8783a0b29db836e409876f2b3e847f78e2b21b1fbcc48a93f85f
 F src/vdbeInt.h 5f3d0abcf30c2b7a6672ad4386f18be0fca9c9b2cefe18f85a2e3df74f2613bf
 F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
-F src/vdbeaux.c baafd56664ccca4cf361a48b912f7ff37f95ee19aaf7cada420ce2ca73396833
+F src/vdbeaux.c ac98cd2fbf32fd1dec548d362f69103b64ec391a3926bb64ab2e9cfa875f6b05
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 7189090b72baa025f945a1ac8c61ee420c645254476e8a191d555db76dfea5d4
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -1945,8 +1945,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 04d5b637f087520cd58211505f9b5c086ff96d864a1908f60464b6fe22c62b7d
-R 247d42769b42eb4f49b3d0e81a9caafe
-U larrybr
-Z 012ec694a47eae04b9be0b86d525b8a4
+P 82366436ef74838dae1f379f3e5b8ad187225a30ec58fb49f047ab7c08a263cf
+Q +009bbf8026106c5a74cced06cced48badb870a4b6e6a2f8104a544d2a8d79e45
+R 7ec2e027f14c1113394a6f2b89ad97e8
+U drh
+Z 913b185da9d2fc4d6a61edeeeba6fe46
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0034ef782e9a66400619501274cc3a43acbe80ad..da113a594171a245120eefc0d7b651036be0a3be 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-82366436ef74838dae1f379f3e5b8ad187225a30ec58fb49f047ab7c08a263cf
\ No newline at end of file
+1b2c5cef9560123344db391cd065090d1914724715ec6643d2d9b5fac2051a21
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 78bb0c2ebf9b22ca58d97d042d4da917fadc4e97..f5916c53eef6aa1ed742f9c725c814376da3d10a 100644 (file)
--- 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 092ccbcd1b0af08da2c97e25d7f884a5896617e4..16b6f9bb551e575274222ddcf8b2d84aa85d2a12 100644 (file)
--- 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 cb2433c2cde789d40cf27e95de70fb23f41592ec..a67bc68f9e3da34b015570475c9111337f296c1b 100644 (file)
--- 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;