In the CLI, fix ".mode quote" output for UTF16 BLOBs.

[forum:/forumpost/b4bfe62fe6|Forum post b4bfe62fe6].

FossilOrigin-Name: 728e9dcc6d211acd787837c41cb62275284b5e02f55bd28bf5a44e233bcb057a

diff --git a/manifest b/manifest
index 6a5453644004d9f32baedc3118e350ddbbdd1c54..e8a351b50a02aa5678c8aedd740248962e51dea3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sopen\sa\srollback\sjournal\sfile\swhen\sthe\sjournal_mode\sis\sOFF,\seven\sif\nsuch\sa\sfile\sexists\son\sdisk.\sSee\n[forum/forumpost/ec2a102440|forum\spost\sec2a102440]\sfor\sa\sdescription.\s\sI\sso\nfar\shave\sbeen\sunable\sto\sfind\sany\sharm\sto\scome\sof\sthe\sproblem,\sother\sthan\sthe\nassertion\sfault\swhen\sin\sDEBUG\smode.
-D 2022-01-02T19:32:43.030
+C In\sthe\sCLI,\sfix\s".mode\squote"\soutput\sfor\sUTF16\sBLOBs.\n[forum:/forumpost/b4bfe62fe6|Forum\spost\sb4bfe62fe6].
+D 2022-01-02T20:54:33.787
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -551,7 +551,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 359bc0e445d427583d2ab6110433a5dc777f64a0ecdf8d24826d8b475233ead9
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 342e096c2737a3ee60753e91de6e6660c7f59cd2988b3e1ab641d38fd885003f
-F src/shell.c.in de39d52ee7e8e09522c13ac2321616708f10ebe959b668da012ae8489cb7d1d4
+F src/shell.c.in f5111900d646a07da18e6438d57be20f112397daba6bfc85b117a0da586e55da
 F src/sqlite.h.in a5e0d6bd47e67aabf1475986d36bdcc7bfa9e06566790ebf8e3aa7fa551c9f99
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 01eb85e4f2759a5ee79c183f4b2877889d4ffdc49d27ae74529c9579e3c8c0ef
@@ -1936,8 +1936,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 4bb78ce8b50af3c6f04ffdf4de4438e61370a73ccfa971479af5d58a0a7e5fbb
-R 992de5604e46c8c75e045be72cbcb1d3
+P fdf9ed665b2fb07d26f3852bfd2170f2fb56851edd2851d47672116a8ea58463
+R c19b8b7c6b9827270ebb21ea2cc50c5f
 U drh
-Z 6823f2139f56a62ab1cf2ba296036bb4
+Z 3c82b93914a4204ff343c58de0981267
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 58e536f70822314a9fb815e62475ea58c750f737..4a24aea9ba5d18ca1cbdb164186c55d018dca8ad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fdf9ed665b2fb07d26f3852bfd2170f2fb56851edd2851d47672116a8ea58463
\ No newline at end of file
+728e9dcc6d211acd787837c41cb62275284b5e02f55bd28bf5a44e233bcb057a
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index ec39da54b7f716f2a724abd1b171d6fa2430023b..3d15cc1f892920d00cff7117c30e6dd3730fad68 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3366,7 +3366,10 @@ static void exec_prepared_stmt(
         /* extract the data and data types */
         for(i=0; i<nCol; i++){
           aiTypes[i] = x = sqlite3_column_type(pStmt, i);
-          if( x==SQLITE_BLOB && pArg && pArg->cMode==MODE_Insert ){
+          if( x==SQLITE_BLOB
+           && pArg
+           && (pArg->cMode==MODE_Insert || pArg->cMode==MODE_Quote)
+          ){
             azVals[i] = "";
           }else{
             azVals[i] = (char*)sqlite3_column_text(pStmt, i);