From 0518d061175e6b70197d2f8ad9e54d3e2062d5d7 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 24 Mar 2020 13:27:53 +0000
Subject: [PATCH] Provide content for the bytecode.subprog column.

FossilOrigin-Name: df893364b7cea07ff2b15b80cb294dccaffe701d51452264599b55304a36fa7c
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/vdbeaux.c  |  2 +-
 src/vdbevtab.c | 29 +++++++++++++++++++++--------
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index ad8a6848b4..d5a3f7938f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sbuild\sso\sthat\sit\sworks\seven\swithout\sSQLITE_ENABLE_EXPLAIN_COMMENTS.
-D 2020-03-23T23:17:38.750
+C Provide\scontent\sfor\sthe\sbytecode.subprog\scolumn.
+D 2020-03-24T13:27:53.953
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -607,12 +607,12 @@ F src/vdbe.c c1c123c6248fa88940b932a00bcc75056921b6d046d45a82566cb97415d2299c
 F src/vdbe.h 07b8c636a87df8b6e58f29d6badd7f10d5844353deff1d7c88ed1c2bfe3bbd35
 F src/vdbeInt.h 5f36e2261731e6a39c66c6902634e474d4a98ed14ca10be6dea5c3776ece4342
 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
-F src/vdbeaux.c c99bdd953b93d74bfc22c11a47a9fb79e6e498017a4d2c7eb4a0320d54df60fd
+F src/vdbeaux.c 9aceb1802cda5f0ce45951afc4b99d5b352d68f95acca7e731bbdc61cd585702
 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 F src/vdbemem.c 39b942ecca179f4f30a32b54579a85d74ccaefa5af2a0ad2700abe5ef0768b22
 F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
 F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
-F src/vdbevtab.c 412a9a432dae219a34ca9ee321b3536cd6c55f1dc1f80290d6b7795f3f8647db
+F src/vdbevtab.c 1051181ff9d3e038a6e6be53202a63866974274d27d6e6e1a756b217114264bf
 F src/vtab.c 7b704a90515a239c6cdba6a66b1bb3a385e62326cceb5ecb05ec7a091d6b8515
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 697424314e40d99f93f548c7bfa526c10e87f4bdf64d5a76a96b999dd7133ebc
@@ -1861,7 +1861,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6819b86eb2de516c445655a83f9b2ba5ae0bff660cffaf84f1345d9be79b051e
-R b791763565a600914b8ed358ac45d71f
+P 5896cbf4d0c7854c29c96d2ea2cea4adaedaa027a0fe4a3f0ac4dfbeaabb8dec
+R 3f50b91586b8e76cd041dd011af7c276
 U drh
-Z f67cc20bd0e690a5ab7aa0e742134572
+Z 2fb9a1a76e4065ceed4eb9eb209fdb3a
diff --git a/manifest.uuid b/manifest.uuid
index baae3fe007..0000c89bf9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5896cbf4d0c7854c29c96d2ea2cea4adaedaa027a0fe4a3f0ac4dfbeaabb8dec
\ No newline at end of file
+df893364b7cea07ff2b15b80cb294dccaffe701d51452264599b55304a36fa7c
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 6c6eb8ec5f..418cc57d33 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2030,7 +2030,7 @@ int sqlite3VdbeNextOpcode(
         }
         apSub = (SubProgram **)pSub->z;
         apSub[nSub++] = aOp[i].p4.pProgram;
-        pSub->flags |= MEM_Blob;
+        MemSetTypeFlag(pSub, MEM_Blob);
         pSub->n = nSub*sizeof(SubProgram*);
         nRow += aOp[i].p4.pProgram->nOp;
       }
diff --git a/src/vdbevtab.c b/src/vdbevtab.c
index a6c1a0526a..b5ec3d3c55 100644
--- a/src/vdbevtab.c
+++ b/src/vdbevtab.c
@@ -165,24 +165,24 @@ static int bytecodevtabColumn(
   bytecodevtab *pVTab;
   Op *pOp = pCur->aOp + pCur->iAddr;
   switch( i ){
-    case 0:
+    case 0:   /* addr */
       sqlite3_result_int(ctx, pCur->iAddr);
       break;
-    case 1:
+    case 1:   /* opcode */
       sqlite3_result_text(ctx, (char*)sqlite3OpcodeName(pOp->opcode),
                           -1, SQLITE_STATIC);
       break;
-    case 2:
+    case 2:   /* p1 */
       sqlite3_result_int(ctx, pOp->p1);
       break;
-    case 3:
+    case 3:   /* p2 */
       sqlite3_result_int(ctx, pOp->p2);
       break;
-    case 4:
+    case 4:   /* p3 */
       sqlite3_result_int(ctx, pOp->p3);
       break;
-    case 5:
-    case 7:
+    case 5:   /* p4 */
+    case 7:   /* comment */
       pVTab = (bytecodevtab*)cur->pVtab;
       if( pCur->zP4==0 ){
         pCur->zP4 = sqlite3VdbeDisplayP4(pVTab->db, pOp);
@@ -196,9 +196,22 @@ static int bytecodevtabColumn(
 #endif
       }
       break;
-    case 6:
+    case 6:     /* p5 */
       sqlite3_result_int(ctx, pOp->p5);
       break;
+    case 8: {   /* subprog */
+      Op *aOp = pCur->aOp;
+      if( pCur->iRowid==pCur->iAddr+1 ){
+        break;  /* Result is NULL for the main program */
+      }else if( aOp[0].p4type==P4_DYNAMIC
+       && aOp[0].p4.z!=0
+       && strncmp(aOp[0].p4.z,"-- ", 3)==0 ){
+         sqlite3_result_text(ctx, aOp[0].p4.z+3, -1, SQLITE_STATIC);
+      }else{
+         sqlite3_result_text(ctx, "(FK)", 4, SQLITE_STATIC);
+      }
+      break;
+    }
   }
   return SQLITE_OK;
 }
-- 
2.47.2