From: larrybr <larrybr@noemail.net>
Date: Tue, 6 Dec 2022 19:25:07 +0000 (+0000)
Subject: Merge from trunk prepratory to branch end.
X-Git-Tag: version-3.41.0~299^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1751f875bc35d9ba9dc89eaee99de9beb53f1af9;p=thirdparty%2Fsqlite.git

Merge from trunk prepratory to branch end.

FossilOrigin-Name: 1d01f8483af7b6a4e93a49fd8bbb6a2b9300e969b574efeb96d56081a33055c4
---

1751f875bc35d9ba9dc89eaee99de9beb53f1af9
diff --cc manifest
index 56f9cf4031,c4286f7f7d,8f1f6b3afe..10e0a659a5
--- a/manifest
+++ b/manifest
@@@@ -1,5 -1,5 -1,5 +1,5 @@@@
-  C For\sCLI\s.sha3sum,\semit\swarning\sto\sstderr\sfor\sany\sinvalidly\sencoded\stext\sfields.
-  D 2022-12-06T18:48:37.123
 - C Have\ssqlite3_stmt_scanstatus_v2()\sreturn\san\sNCYCLE\svalue\sfor\sall\sloops,\snot\sjust\svirtual\stables\sones.\sThe\svalue\sreturned\sis\sthe\ssum\sof\sthe\sNCYCLE\scounts\sfor\sthe\svarious\sopcodes\sthat\smove\sor\sread\sdata\sfrom\sthe\stable\sor\sindex\scursor\sassociated\swith\sthe\sloop.
 - D 2022-12-06T18:48:06.154
  -C Avoid\sseveral\s-Wall\swarnings\sin\stextfixture\sbuild.
  -D 2022-12-06T19:20:49.029
+++C Merge\sfrom\strunk\sprepratory\sto\sbranch\send.
+++D 2022-12-06T19:25:07.478
   F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
   F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
   F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@@ -645,12 -645,12 -645,12 +645,12 @@@@ F src/printf.c e99ee9741e79ae3873458146
   F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
   F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
   F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-  F src/select.c 6983de0e6b8b68c97f82f9fca27ffb8f17161cff4d0d48fdf9eb40b213da0cc6
-  F src/shell.c.in cf32c16e1b4ff8e434b51fe38753bfddccd75d4a3ecb1fb838a6f96a70e2ff3a
-  F src/sqlite.h.in 3439711b72cf1a541716da3671ac40f8d5957cdecfc192d47d32f7aed94207c2
+  F src/select.c 56162cde2f71314826f831618eae853205628080afa25cd90faef7a9b761dee4
 --F src/shell.c.in 991eff7f819f96ae76671e7aa44597ac702274fd441d3b0d9297cbd3b9ce1284
+++F src/shell.c.in b5bc6e14605b8d1e8de729454d98d3353ad7e529a8d2b6e34080d068e99bff99
+  F src/sqlite.h.in 1fe1836879ecbb2e28f00f44eb6092db09a2a06bf072af351c6c2466bd515496
   F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
   F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
-  F src/sqliteInt.h 4ddd98e423276714479f9f22dbbda050e8ef99aa97e7e26bf0bdf58acef0ca42
+  F src/sqliteInt.h 0c9934acd88e0fa14f0d4743233b4cd7bd7bbc84099ba3cad50d8e69676ce2b9
   F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
   F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
   F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@@ -2065,8 -2067,8 -2067,8 +2067,8 @@@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
   F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
   F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
   F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-  P 123f2a0785790addf9c60a0fd09077dda9cb84d33a2594901a2b22bb555be491
-  R 1a108a993a6e5c4e1463804542f95600
 - P 540e895d877fab1ea138786e56923a202018f68c78199a89adfc296c75735b30
 - R e347a9226ee206cfe1e680e2e5e722d0
 - U dan
 - Z eaf9f5c14b0f034256d24205aa5d85c9
  -P 9499b2f51e8174c6b8a67840c92ba23b7dd1dc8dc2b91fca0c5dc07b71662149
  -R 6d3961aec4c1529b866a56388835711c
+++P 8e833ecc81367658e81acd1d3a0242ab954a62d6f719af56f1d185656d0b73e6 9499b2f51e8174c6b8a67840c92ba23b7dd1dc8dc2b91fca0c5dc07b71662149 03ae8680e430c6d2c39ca26fa2cb6eed46e3c3e52b53f7a8bf548560446c6d3d
+++R 2aee8123cf630f6dc747669c6dfb6cfe
 + U larrybr
-  Z 23502144cb7b8e35b977c4658f2c6efa
  -Z 815c066cfe76a0b0ad34b27b7be96db7
+++Z 454f785f671f223a15f2524ef9698b47
   # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index b0fd6bc454,79c29e3304,914d5983d2..65e549ce78
--- a/manifest.uuid
+++ b/manifest.uuid
@@@@ -1,1 -1,1 -1,1 +1,1 @@@@
-  8e833ecc81367658e81acd1d3a0242ab954a62d6f719af56f1d185656d0b73e6
 - 9499b2f51e8174c6b8a67840c92ba23b7dd1dc8dc2b91fca0c5dc07b71662149
  -03ae8680e430c6d2c39ca26fa2cb6eed46e3c3e52b53f7a8bf548560446c6d3d
+++1d01f8483af7b6a4e93a49fd8bbb6a2b9300e969b574efeb96d56081a33055c4
diff --cc src/shell.c.in
index a74614eaac,a5c4c48c15,a5c4c48c15..9c1fe111f5
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@@@ -10180,56 -10328,6 -10328,6 +10328,56 @@@@ static int do_meta_command(char *zLine
       }else{
         shell_exec(p, zSql, 0);
       }
 ++    {
 ++      int lrc;
 ++      char *zRevText = /* Query for reversible to-blob-to-text check */
 ++	"SELECT lower(name) as tname FROM sqlite_schema\n"
 ++	"WHERE type='table' AND coalesce(rootpage,0)>1\n"
 ++	"AND name NOT LIKE 'sqlite_%%'%s\n"
 ++	"ORDER BY 1 collate nocase";
 ++      zRevText = sqlite3_mprintf(zRevText, zLike? " AND name LIKE $tspec" : "");
 ++      zRevText = sqlite3_mprintf(
 ++	  /* lower-case query is first run, producing upper-case query. */
 ++	  "with tabcols as materialized(\n"
 ++	  "select tname, cname\n"
 ++	  "from ("
 ++	  " select ss.tname as tname, ti.name as cname\n"
 ++	  " from (%z) ss\n inner join pragma_table_info(tname) ti))\n"
 ++	  "select 'SELECT total(bad_text_count) AS bad_text_count\n"
 ++	  "FROM ('||group_concat(query, ' UNION ALL ')||')' as btc_query\n"
 ++	  " from (select 'SELECT COUNT(*) AS bad_text_count\n"
 ++	  "FROM '||tname||' WHERE '\n"
 ++	  "||group_concat('CAST(CAST('||cname||' AS BLOB) AS TEXT)<>'||cname\n"
 ++	  "|| ' AND typeof('||cname||')=''text'' ',\n"
 ++	  "' OR ') as query, tname from tabcols group by tname)"
 ++	  , zRevText);
 ++      shell_check_oom(zRevText);
 ++      if( bDebug ) utf8_printf(p->out, "%s\n", zRevText);
 ++      lrc = sqlite3_prepare_v2(p->db, zRevText, -1, &pStmt, 0);
 ++      assert(lrc==SQLITE_OK);
 ++      if( zLike ) sqlite3_bind_text(pStmt,1,zLike,-1,SQLITE_STATIC);
 ++      lrc = SQLITE_ROW==sqlite3_step(pStmt);
 ++      if( lrc ){
-          const char *zGenQuery = sqlite3_column_text(pStmt,0);
+++        const char *zGenQuery = (char*)sqlite3_column_text(pStmt,0);
 ++        sqlite3_stmt *pCheckStmt;
 ++        lrc = sqlite3_prepare_v2(p->db, zGenQuery, -1, &pCheckStmt, 0);
 ++        if( bDebug ) utf8_printf(p->out, "%s\n", zGenQuery);
 ++        if( SQLITE_OK==lrc ){
 ++	  if( SQLITE_ROW==sqlite3_step(pCheckStmt) ){
 ++	    double countIrreversible = sqlite3_column_double(pCheckStmt, 0);
 ++	    if( countIrreversible>0 ){
 ++	      int n = (int)(countIrreversible + 0.5);
 ++	      utf8_printf(stderr,
 ++		 "Digest includes %d invalidly encoded text field%s.\n",
 ++		 n, (n>1)? "s": "");
 ++	    }
 ++	  }
 ++	  sqlite3_finalize(pCheckStmt);
 ++        }
 ++        sqlite3_finalize(pStmt);
 ++      }
 ++      sqlite3_free(zRevText);
 ++    }
       sqlite3_free(zSql);
     }else