From: larrybr <larrybr@noemail.net>
Date: Sat, 12 Feb 2022 10:48:42 +0000 (+0000)
Subject: Fix auto-column bug noted by post https://sqlite.org/forum/forumpost/d102c15d63
X-Git-Tag: version-3.38.0~15^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a704c314555093549d11a898830d3d99228850c;p=thirdparty%2Fsqlite.git

Fix auto-column bug noted by post https://sqlite.org/forum/forumpost/d102c15d63

FossilOrigin-Name: 689137e1b5bc78b0f16e5db86d16415b9fa77d22ded59e93d75e7033b465e673
---

diff --git a/manifest b/manifest
index 505325b6ec..65424ef168 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Sync\sw/trunk,\sallow\sbuild-time\soverride\sof\sauto-column\sdecorating\scharacter
-D 2022-02-12T02:15:37.064
+C Fix\sauto-column\sbug\snoted\sby\spost\shttps://sqlite.org/forum/forumpost/d102c15d63
+D 2022-02-12T10:48:42.243
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -553,7 +553,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 3baa9dd8cf240654773c7974e2bcce398ac9dd24419c36684156963defe43b35
-F src/shell.c.in 910aa363580f8e75c9d62c03baef2dcec25d077b9f04dacfe61df33f85b0107d
+F src/shell.c.in b4ef80a729f82ad5cedda0e283e551d879412eb5009b10f45072293fdaa31c78 x
 F src/sqlite.h.in 7047c4b60fa550264d6363bb1d983540e7828fb19d2d1e5aa43b52ca13144807
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a95cb9ed106e3d39e2118e4dcc15a14faec3fa50d0093425083d340d9dfd96e6
@@ -1392,7 +1392,7 @@ F test/shell1.test b224e0793c5f48aa3749e65d8c64b93a30731bd206f2e41e6c5f1bee1bdb1
 F test/shell2.test 89e4b2db062d52baed75022227b462d085cff495809de1699652779d8e0257d6
 F test/shell3.test a50628ab1d78d90889d9d3f32fb2c084ee15674771e96afe954aaa0accd1de3c
 F test/shell4.test 8f6c0fce4abed19a8a7f7262517149812a04caa905d01bdc8f5e92573504b759
-F test/shell5.test c164da8b5e397b1ad2fae6ac8daee0697f064f7c0ea0882086a28860b88af182
+F test/shell5.test 1be5454b8376e363f99cd0947ab43e1121e5b802c067d1fe7089e3461de1421d x
 F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b00d3
 F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f
 F test/shell8.test 388471d16e4de767333107e30653983f186232c0e863f4490bb230419e830aae
@@ -1944,8 +1944,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 8b6ca9304bff9a5b2897a6517ce77e4cd32f337b6c849b73ead5f757228d8ac8 ca22a64e6f05a6688974f4cff1a0ff2c873aad1947f3cf6ffaeee8bb074b2627
-R f2657b8c4f3b23824e6168670f3c28c6
+P caaef4c592c980889efb349fa73b61303ec493172d90cd67d54ffde0855e4138
+R eb64a5c15c31ec1dd30354269699f3b9
 U larrybr
-Z 72b6123e2f6f8261fe59a92cab260c52
+Z da19ff331b971aff319325862b93569d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1a92c95aa0..d186199d04 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-caaef4c592c980889efb349fa73b61303ec493172d90cd67d54ffde0855e4138
\ No newline at end of file
+689137e1b5bc78b0f16e5db86d16415b9fa77d22ded59e93d75e7033b465e673
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
old mode 100644
new mode 100755
index 65b842db9a..70567361d7
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7277,7 +7277,7 @@ INSERT INTO ColNames(name,nlen,chop,reps,suff)\
  VALUES(iif(length(?1)>0,?1,'?'),max(length(?1),1),0,0,'')\
 ";
   static const char const *zHasDupes = "\
-SELECT count(DISTINCT substring(name,1,nlen-chop)||suff)\
+SELECT count(DISTINCT (substring(name,1,nlen-chop)||suff) COLLATE NOCASE)\
  <count(name) FROM ColNames\
 ";
   static const char const *zDedoctor = "\
@@ -7311,6 +7311,7 @@ WITH chopped AS ( \
 UPDATE ColNames AS t SET reps=\
 (SELECT count(*) FROM ColNames d \
  WHERE substring(t.name,1,t.nlen-t.chop)=substring(d.name,1,d.nlen-d.chop)\
+ COLLATE NOCASE\
 )\
 ";
 #ifdef SQLITE_ENABLE_MATH_FUNCTIONS
diff --git a/test/shell5.test b/test/shell5.test
old mode 100644
new mode 100755
index a0a10eeb4d..55fce187fa
--- a/test/shell5.test
+++ b/test/shell5.test
@@ -499,4 +499,20 @@ SELECT * FROM t1;}
   z_6 = zee6
 Columns renamed during .import shell5.csv due to duplicates.}}
 
+do_test shell5-5.1 {
+  set out [open shell5.csv w]
+  fconfigure $out -translation lf
+  puts $out {"COW","cow","CoW","cOw"}
+  puts $out {"uuu","lll","ulu","lul"}
+  close $out
+  forcedelete test.db
+  catchcmd test.db {.import -csv shell5.csv t1
+.mode line
+SELECT * FROM t1;}
+} {1 {COW_1 = uuu
+cow_2 = lll
+CoW_3 = ulu
+cOw_4 = lul
+Columns renamed during .import shell5.csv due to duplicates.}}
+
 finish_test