From: drh <drh@noemail.net>
Date: Mon, 17 Aug 2020 09:11:21 +0000 (+0000)
Subject: Fix the -quote option on the CLI to set the correct column separator.
X-Git-Tag: version-3.34.0~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9191c702fcd7802a6155fbb3134a993ef036f7a5;p=thirdparty%2Fsqlite.git

Fix the -quote option on the CLI to set the correct column separator.

FossilOrigin-Name: c778f8295c3c9b6cd6107b33fd7664ae75c97840fc974c9f971755a523f185c4
---

diff --git a/manifest b/manifest
index b19c0368c2..2ed59d4629 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimization\sto\ssqlite3BeginWriteOperation().
-D 2020-08-16T00:30:44.476
+C Fix\sthe\s-quote\soption\son\sthe\sCLI\sto\sset\sthe\scorrect\scolumn\sseparator.
+D 2020-08-17T09:11:21.359
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -536,7 +536,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c d74715aceed2a8f493ba244d535646fa93132042a4400a29dfd26ec841514048
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 510fdf819f218be3dac2683d3eaaf64e5080f548061a4dd12205590beda976bb
-F src/shell.c.in b9b819feede7b85585ab0826490a352e04e2ee46e8132c92597d29972b2be1d7
+F src/shell.c.in b6d5d6ebeb8903e4946f23f0886f24133e0a9b6ecbc4cf90ede422ba297e73d5
 F src/sqlite.h.in d2c03414a8ee5d4a6855c04dd7cd5998e45139b0fe66b65bae86d4223edd091f
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 2d1af80082edffd71c6f96f70ad1ce6a4fb46615ad10291fc77fe0dea9ff0197
@@ -1879,7 +1879,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 1b4acd1ac4a8d24f8804c6d0770f5b0022f569d51742b6954b26e525f04d38ca
-R eb7d2eb9837b02d692f86ab11127e1d5
+P 2173d4c6e3addc75964508f2fc8e42755376b3bc285286fa90df4831a6fa280b
+R 442f1dbe4ea4377ad5ec4785729f8731
 U drh
-Z 4f2f05a1f836926720a2c2ef3cbb9300
+Z 385eef9b5efbc0b41b1aec1e03dd9010
diff --git a/manifest.uuid b/manifest.uuid
index 9aa575c482..16fa0e8674 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2173d4c6e3addc75964508f2fc8e42755376b3bc285286fa90df4831a6fa280b
\ No newline at end of file
+c778f8295c3c9b6cd6107b33fd7664ae75c97840fc974c9f971755a523f185c4
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 894462acba..8d238d4ab6 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -11015,6 +11015,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       data.mode = MODE_List;
     }else if( strcmp(z,"-quote")==0 ){
       data.mode = MODE_Quote;
+      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator, SEP_Comma);
+      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator, SEP_Row);
     }else if( strcmp(z,"-line")==0 ){
       data.mode = MODE_Line;
     }else if( strcmp(z,"-column")==0 ){