Change the name of SQLITE_DBCONFIG_STMT_SCANSTATS to SQLITE_DBCONFIG_STMT_SCANSTATUS.

FossilOrigin-Name: a63e4a150b505fc309fac847131009ee9965eb1b798ebcb202ec8b52f9189240

diff --git a/manifest b/manifest
index c289db4cb629abb726bcb16aba16e8930267eac7..61abcb8b6e8a76afaa511eca529d3dad2a767a4c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\ssqlite3_db_config()\soption\s-\sSQLITE_DBCONFIG_STMT_SCANSTATS\s-\sfor\senabling\sand\sdisabling\sthe\scollection\sof\ssqlite3_stmt_scanstats()\sstatistics\sin\sSQLITE_ENABLE_STMT_SCANSTATUS\sbuilds.\sCollection\sof\sstatistics\sis\sdisabled\sby\sdefault.
-D 2023-02-28T19:39:59.514
+C Change\sthe\sname\sof\sSQLITE_DBCONFIG_STMT_SCANSTATS\sto\sSQLITE_DBCONFIG_STMT_SCANSTATUS.
+D 2023-02-28T20:04:01.467
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -586,7 +586,7 @@ F src/insert.c 7940fce7d4aa855606432d82d20694e17c18a03956f5f5776f2404e2df7c18a8
 F src/json.c c85ed6fce06f43d414b0d7fff64749d43a0dbd1067123ee407bd3a0752454161
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c b04eb648cedc45efe4298e1ef439ac4f0096ae27b5f01accb0a1f49d57789128
-F src/main.c 834e257234fdf9e74c204c1a130920941618e48b2065747162862773ba5416b5
+F src/main.c e5f5323a33c51403bbe83ccb9f3e40aa94f95fd65dbeb5992a12435e0f6c22f9
 F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -624,16 +624,16 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 230dc0601f55ae4909b5f88bc002bfa1f1fb331e51f2c6d670d3effc2ced365e
-F src/shell.c.in a319e2a6cdb166d65a91ad0e69a2e9dea6afd066acbf9adce883a6762b43ec49
-F src/sqlite.h.in 7a2fed8c11df276bc35bc9ac47981cb0a7f9db39b85761a7dd50028fe77d28ce
+F src/shell.c.in af928afa0376b2e2c962be9a0a3ab716b3983b1adfae10e248ffd40ede03b049
+F src/sqlite.h.in dd0f802db5ce8b2e384cf1e04debe175b38ab5ba2c8e09f00672e8b79a1bb134
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
-F src/sqliteInt.h e40980dd50f31aa57bed8dbb32c8fecf64b3ad9bc235a3abb24a3b95734cafeb
+F src/sqliteInt.h 87bcbb5e08d454e4ee615079fe0de311e2d62bea776efb90f366bf876d42d9ad
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 8522a04fb9c84faa1d80354430ae0ee9349727a3a4b32e3cfe39b9be8324cabd
-F src/test1.c 5ca9cb48a5dfef5980417bf5f76594071ae94795cbb8d065f8a1290c3b308ec6
+F src/test1.c 74d87bbc29954c239fdcd7c0c3dd472c0eb9761c7289b85389f322233932780a
 F src/test2.c 827446e259a3b7ab949da1542953edda7b5117982576d3e6f1c24a0dd20a5cef
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
@@ -1436,8 +1436,8 @@ F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
 F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
 F test/savepoint7.test cde525ea3075283eb950cdcdefe23ead4f700daa
 F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
-F test/scanstatus.test 177fe0fea60898b2190328fbe358bafa2637e81856f90fb527a792efaf249c14
-F test/scanstatus2.test 7c367a5c818bad1936f291d33f688a3daa42279d4e989d920660c7002d67d3a2
+F test/scanstatus.test 2adde2d8fb0fbae73e790afa724f15ea4c3d6d0809e5de4d00407c5c14836401
+F test/scanstatus2.test b77de449be6ffd7a913a06dd84276dc6eb3517d479126e00ac51cd409c0a0af5
 F test/schema.test 5dd11c96ba64744de955315d2e4f8992e447533690153b93377dffb2a5ef5431
 F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
 F test/schema3.test 8ed4ae66e082cdd8b1b1f22d8549e1e7a0db4527a8e6ee8b6193053ee1e5c9ce
@@ -2048,8 +2048,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5916705c731604d2e6b51a307cc8d7b67f4c102062bfdfcbc716a2916e0b0d86
-R 62c12b75bd9869fbb782d0697362eb0c
+P 0f5579bef27b84ee855065cfe87703c51e1f9773906a9e0d4e4dafc90bd0e553
+R 9421f5c28d2a68696ef4d0c2d913d8d5
 U dan
-Z 823edb92d517eed03d3961ba1e99b0c0
+Z d689787b0a2f50878869838fedf1f287
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b5a7d79f5a4f4da3509742803108cfbb5b386f54..d10062521660fac9c84db144502567a186490109 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f5579bef27b84ee855065cfe87703c51e1f9773906a9e0d4e4dafc90bd0e553
\ No newline at end of file
+a63e4a150b505fc309fac847131009ee9965eb1b798ebcb202ec8b52f9189240
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index a0e5e658524b2b1fc034d1b7044cdfc69391a6a1..e79d676139375dcc3142f3b598c30bb9a583cebc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -970,7 +970,7 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){
         { SQLITE_DBCONFIG_DQS_DML,               SQLITE_DqsDML         },
         { SQLITE_DBCONFIG_LEGACY_FILE_FORMAT,    SQLITE_LegacyFileFmt  },
         { SQLITE_DBCONFIG_TRUSTED_SCHEMA,        SQLITE_TrustedSchema  },
-        { SQLITE_DBCONFIG_STMT_SCANSTATS,        SQLITE_StmtScanStats  },
+        { SQLITE_DBCONFIG_STMT_SCANSTATUS,       SQLITE_StmtScanStatus },
       };
       unsigned int i;
       rc = SQLITE_ERROR; /* IMP: R-42790-23372 */

diff --git a/src/shell.c.in b/src/shell.c.in
index a983ec0c0eb3f08f9b4738a4c94782de7630651c..0a54a3c5a5e775b610bb0b691695898a0542c26a 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5421,7 +5421,7 @@ static void open_db(ShellState *p, int openFlags){
       sqlite3_set_authorizer(p->db, safeModeAuth, p);
     }
     sqlite3_db_config(
-        p->db, SQLITE_DBCONFIG_STMT_SCANSTATS, p->scanstatsOn, (int*)0
+        p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, p->scanstatsOn, (int*)0
     );
   }
 }
@@ -9775,7 +9775,7 @@ static int do_meta_command(char *zLine, ShellState *p){
         p->scanstatsOn = (u8)booleanValue(azArg[1]);
       }
       sqlite3_db_config(
-          p->db, SQLITE_DBCONFIG_STMT_SCANSTATS, p->scanstatsOn, (int*)0
+          p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, p->scanstatsOn, (int*)0
       );
 #ifndef SQLITE_ENABLE_STMT_SCANSTATUS
       raw_printf(stderr, "Warning: .scanstats not available in this build.\n");

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 0a31ba033db702a1f50a4c7908fb39f8d16067d7..03e4862cc834ad79ee6f8bb84caaeae7c05d4b96 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2457,10 +2457,10 @@ struct sqlite3_mem_methods {
 ** either generated columns or decending indexes.
 ** </dd>
 
-** [[SQLITE_DBCONFIG_STMT_SCANSTATS]]
-** <dt>SQLITE_DBCONFIG_STMT_SCANSTATS</td>
-** <dd>The SQLITE_DBCONFIG_STMT_SCANSTATS option is only useful in
-** SQLITE_ENABLE_STMT_SCANSTATS builds. In this case, it sets or clears
+** [[SQLITE_DBCONFIG_STMT_SCANSTATUS]]
+** <dt>SQLITE_DBCONFIG_STMT_SCANSTATUS</td>
+** <dd>The SQLITE_DBCONFIG_STMT_SCANSTATUS option is only useful in
+** SQLITE_ENABLE_STMT_SCANSTATUS builds. In this case, it sets or clears
 ** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
 ** statistics. For statistics to be collected, the flag must be set on
 ** the database handle both when the SQL statement is prepared and when it 
@@ -2486,7 +2486,7 @@ struct sqlite3_mem_methods {
 #define SQLITE_DBCONFIG_ENABLE_VIEW           1015 /* int int* */
 #define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT    1016 /* int int* */
 #define SQLITE_DBCONFIG_TRUSTED_SCHEMA        1017 /* int int* */
-#define SQLITE_DBCONFIG_STMT_SCANSTATS        1018 /* int int* */
+#define SQLITE_DBCONFIG_STMT_SCANSTATUS       1018 /* int int* */
 #define SQLITE_DBCONFIG_MAX                   1018 /* Largest DBCONFIG */
 
 /*

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 21ad2fa7e119c8e6c7749f57899c539496129357..e97fed25f19355c7060685fc1563019ab281f870 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1757,7 +1757,7 @@ struct sqlite3 {
 #define SQLITE_NullCallback   0x00000100  /* Invoke the callback once if the */
                                           /*   result set is empty */
 #define SQLITE_IgnoreChecks   0x00000200  /* Do not enforce check constraints */
-#define SQLITE_StmtScanStats  0x00000400  /* Enable stmt_scanstats() counters */
+#define SQLITE_StmtScanStatus 0x00000400  /* Enable stmt_scanstats() counters */
 #define SQLITE_NoCkptOnClose  0x00000800  /* No checkpoint on close()/DETACH */
 #define SQLITE_ReverseOrder   0x00001000  /* Reverse unordered SELECTs */
 #define SQLITE_RecTriggers    0x00002000  /* Enable recursive triggers */
@@ -5583,7 +5583,7 @@ sqlite3_uint64 sqlite3Hwtime(void);
 #endif
 
 #ifdef SQLITE_ENABLE_STMT_SCANSTATUS
-# define IS_STMT_SCANSTATUS(db) (db->flags & SQLITE_StmtScanStats)
+# define IS_STMT_SCANSTATUS(db) (db->flags & SQLITE_StmtScanStatus)
 #else
 # define IS_STMT_SCANSTATUS(db) 0
 #endif

diff --git a/src/test1.c b/src/test1.c
index a765a66fa64113740f41a568a846554f7ff5b1ba..a4cfd28ab6fb5fac197814f0a6fb945b42f824f8 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -8313,7 +8313,7 @@ static int SQLITE_TCLAPI test_sqlite3_db_config(
     { "DQS_DML",            SQLITE_DBCONFIG_DQS_DML },
     { "DQS_DDL",            SQLITE_DBCONFIG_DQS_DDL },
     { "LEGACY_FILE_FORMAT", SQLITE_DBCONFIG_LEGACY_FILE_FORMAT },
-    { "STMT_SCANSTATS",     SQLITE_DBCONFIG_STMT_SCANSTATS },
+    { "STMT_SCANSTATUS",    SQLITE_DBCONFIG_STMT_SCANSTATUS },
   };
   int i;
   int v = 0;

diff --git a/test/scanstatus.test b/test/scanstatus.test
index 1eab9a26a46eecb74a4e1cf478b863efa1c9bc37..ab87ad944ad2b45580c150377d59d58630f8a616 100644 (file)
--- a/test/scanstatus.test
+++ b/test/scanstatus.test
@@ -48,7 +48,7 @@ proc do_scanstatus_test {tn res} {
 do_execsql_test 1.0a { SELECT count(*) FROM t1, t2; } 6
 do_scanstatus_test 1.0b { }
 
-sqlite3_db_config db STMT_SCANSTATS 1
+sqlite3_db_config db STMT_SCANSTATUS 1
 
 do_execsql_test 1.1 { SELECT count(*) FROM t1, t2; } 6
 do_scanstatus_test 1.2 {
@@ -99,7 +99,7 @@ do_scanstatus_test 1.10 {
 # Try a few different types of scans.
 #
 reset_db
-sqlite3_db_config db STMT_SCANSTATS 1
+sqlite3_db_config db STMT_SCANSTATUS 1
 do_execsql_test 2.1 {
   CREATE TABLE x1(i INTEGER PRIMARY KEY, j);
   INSERT INTO x1 VALUES(1, 'one');
@@ -283,7 +283,7 @@ do_scanstatus_test 4.2.2 {
 # Further tests of different scan types.
 #
 reset_db
-sqlite3_db_config db STMT_SCANSTATS 1
+sqlite3_db_config db STMT_SCANSTATUS 1
 proc tochar {i} {
   set alphabet {a b c d e f g h i j k l m n o p q r s t u v w x y z}
   return [lindex $alphabet [expr $i % [llength $alphabet]]]

diff --git a/test/scanstatus2.test b/test/scanstatus2.test
index 7b8453f94b034ad642132bbf09bd2f0d2ccf3038..042128ae14cd867f586a4d5fb2c0e8efc97ad42a 100644 (file)
--- a/test/scanstatus2.test
+++ b/test/scanstatus2.test
@@ -19,7 +19,7 @@ ifcapable !scanstatus {
   return
 }
 
-sqlite3_db_config db STMT_SCANSTATS 1
+sqlite3_db_config db STMT_SCANSTATUS 1
 
 do_execsql_test 1.0 {
   CREATE TABLE t1(a, b);
@@ -143,7 +143,7 @@ QUERY (nCycle=nnn)
 #-------------------------------------------------------------------------
 ifcapable fts5 {
   reset_db
-  sqlite3_db_config db STMT_SCANSTATS 1
+  sqlite3_db_config db STMT_SCANSTATUS 1
   do_execsql_test 2.0 {
     CREATE VIRTUAL TABLE ft USING fts5(a);
     INSERT INTO ft VALUES('abc');
@@ -161,7 +161,7 @@ QUERY (nCycle=nnn)
 
 #-------------------------------------------------------------------------
 reset_db
-sqlite3_db_config db STMT_SCANSTATS 1
+sqlite3_db_config db STMT_SCANSTATUS 1
 do_execsql_test 3.0 {
   CREATE TABLE x1(a, b);
   CREATE TABLE x2(c, d);
@@ -183,7 +183,7 @@ QUERY (nCycle=nnn)
 
 #-------------------------------------------------------------------------
 reset_db
-sqlite3_db_config db STMT_SCANSTATS 1
+sqlite3_db_config db STMT_SCANSTATUS 1
 do_execsql_test 4.0 {
   CREATE TABLE rt1 (id INTEGER PRIMARY KEY, x1, x2);
   CREATE TABLE rt2 (id, x1, x2);