From d3285e67a80ede72022f782d09fde6b08e67ab46 Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 22 Jan 2026 15:59:45 +0000 Subject: [PATCH] For the ".eqp full" show both the QUERY PLAN and the full byte code, just as it has in the past. FossilOrigin-Name: 756484fcaa7efed0691814f3affeb2449d3301c5c764530f2ec8e290caea567f --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/shell.c.in | 8 +++++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 3b32deaf96..a99d9f2260 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\sshell\stool\sto\swork\swith\sSQLITE_OMIT_AUTOINIT\sbuilds. -D 2026-01-20T18:30:48.704 +C For\sthe\s".eqp\sfull"\sshow\sboth\sthe\sQUERY\sPLAN\sand\sthe\sfull\sbyte\scode,\sjust\sas\nit\shas\sin\sthe\spast. +D 2026-01-22T15:59:45.577 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -739,7 +739,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 47aa7fdc9ec4c19b103ac5e79d7887d30119b5675309facf5eed1118391c868b F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 4d45a04431db072040d6625ee21c1dc483c9b2b64a5ab419f4a4e05aabed1204 -F src/shell.c.in 399df56c81dbf51bfa0df73094344e2bf76a443bb7fba729b616ab3d0b769f34 +F src/shell.c.in e8818572acd50464bc00426fe0d755e98239f73d531437c3dc7721d1fecb1231 F src/sqlite.h.in 476f3efeb5dd26ad94dcbce262ca7eb9d042d797a92d624059c67ef37d5b3ab4 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h f590cd8cb4c36fc727632c9b5fbbafc85f7efe2c6890f9958d7e711dc26ec01e @@ -2193,8 +2193,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 6d9ec0a21a2b33a7bb3cf9c3677c9ef7a9738d318cd2d8159b33583b2bd4abec -R d8076aa16a2c760d1df8cf8a346c126f -U dan -Z 909c03dd33b70fa520b61311ab3de8ab +P 2b3b36da9d60c265dceec5964ea51c752d81f41459fb6849c8faea658b253552 +R 9e5a6565e4452411f9695714ff85ba95 +U drh +Z 7ade86c93ca3010bfdd0788463884fbc # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2d01da9535..d6d2621dbe 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2b3b36da9d60c265dceec5964ea51c752d81f41459fb6849c8faea658b253552 +756484fcaa7efed0691814f3affeb2449d3301c5c764530f2ec8e290caea567f diff --git a/src/shell.c.in b/src/shell.c.in index 8676744c1d..c19fc06739 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -3260,8 +3260,14 @@ static int shell_exec( } sqlite3_reset(pStmt); spec.eStyle = QRF_STYLE_Auto; - sqlite3_stmt_explain(pStmt, 2-(pArg->mode.autoEQP>=AUTOEQP_full)); + sqlite3_stmt_explain(pStmt, 2); sqlite3_format_query_result(pStmt, &spec, 0); + if( pArg->mode.autoEQP>=AUTOEQP_full ){ + sqlite3_reset(pStmt); + sqlite3_stmt_explain(pStmt, 1); + sqlite3_format_query_result(pStmt, &spec, 0); + } + if( pArg->mode.autoEQP>=AUTOEQP_trigger && triggerEQP==0 ){ sqlite3_db_config(db, SQLITE_DBCONFIG_TRIGGER_EQP, 0, 0); } -- 2.47.3