Fix the showstat4 utility program so that is displays strings using

standard SQL notation (single quotes) rather than C-style notation.

FossilOrigin-Name: 92998e4afbe4da1723e7e5155071a0e7242bd6ff

diff --git a/manifest b/manifest
index 767b0b5ba8c0917f4e7650f1a0921a88433a103f..546a10b05dd167df0d9eb33f7f7dab4469250f50 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sminor\serror\sin\sthe\scg_anno.tcl\sscript\scausing\sthe\scycles-per-file\scounts\nto\sbe\smiscomputed.
-D 2016-12-08T19:04:36.568
+C Fix\sthe\sshowstat4\sutility\sprogram\sso\sthat\sis\sdisplays\sstrings\susing\nstandard\sSQL\snotation\s(single\squotes)\srather\sthan\sC-style\snotation.
+D 2016-12-08T23:52:38.728
 F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -1492,7 +1492,7 @@ F tool/run-speed-test.sh f95d19fd669b68c4c38b6b475242841d47c66076
 F tool/showdb.c c695a5d5c8110640e0d9fadf5e254da90c79c36e
 F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818
 F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68
-F tool/showstat4.c bda40d6e395df7edb6e9ea630784d3d762c35b4b
+F tool/showstat4.c b14159aa062f661b394ba37b6b7b94bfb8012ab9
 F tool/showwal.c ec79959834f7b21f1e0a2aa52bb7c056d2203977
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
 F tool/spaceanal.tcl ab7d9bf68062907282a64b3e12ccbfad47193c5a
@@ -1536,7 +1536,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 254a83bf30c15d6a355db309ccb97a8744675cc3
-R c83132c87ae23a23d263e8ee60d3c2ea
+P b26df26e184ec6da4b5537526c10f42a293d09b5
+R 20c5d0b862118000112ece07f7baa65b
 U drh
-Z c2b446af19201dba66c3a9f1ed9bef6f
+Z fcf8e16d4cd3aef2bba348beb58ea104

diff --git a/manifest.uuid b/manifest.uuid
index aa4fd7848a986fc61c165c6e9c5377b59000ede2..314984d3d1b4fa9ae29905c30919f71943f27458 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b26df26e184ec6da4b5537526c10f42a293d09b5
\ No newline at end of file
+92998e4afbe4da1723e7e5155071a0e7242bd6ff
\ No newline at end of file

diff --git a/tool/showstat4.c b/tool/showstat4.c
index c7f9b10fbc2eff34341ff57a1cb1a90e29699069..e31150f0c0111cd446f89e89ac25decb01c0a333 100644 (file)
--- a/tool/showstat4.c
+++ b/tool/showstat4.c
@@ -130,11 +130,11 @@ int main(int argc, char **argv){
         }
         printf("'");
       }else{
-        printf("%s\"", zSep);
+        printf("%s'", zSep);
         for(j=0; j<sz; j++){
           char c = (char)aSample[y+j];
           if( ISPRINT(c) ){
-            if( c=='"' || c=='\\' ) putchar('\\');
+            if( c=='\'' || c=='\\' ) putchar('\\');
             putchar(c);
           }else if( c=='\n' ){
             printf("\\n");
@@ -146,7 +146,7 @@ int main(int argc, char **argv){
             printf("\\%03o", c);
           }
         }
-        printf("\"");
+        printf("'");
       }
       zSep = ",";
       y += sz;