From eaba46222c523ef3d6f4eec3d34dfba0dbbc0704 Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 4 Jun 2026 11:35:15 +0000 Subject: [PATCH] Remove the data type ANY added to the shell's CSV imports. FossilOrigin-Name: e14e19c1b33b4f4fe7d9008b0f7f8fa9522d901c13124b0eca4b91acd7156d0d --- manifest | 15 ++++++++------- manifest.uuid | 2 +- src/shell.c.in | 2 +- test/import01.sql | 14 +++++++------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/manifest b/manifest index ae027a11ef..dfab71250a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Increment\sthe\spatch\slevel\sto\s3.53.3. -D 2026-06-04T11:29:09.294 +C Remove\sthe\sdata\stype\sANY\sadded\sto\sthe\sshell's\sCSV\simports. +D 2026-06-04T11:35:15.199 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -736,7 +736,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c f5a780a7b604d43b78bca290cace7479bca0c7d8ef9ce855830d9498b975baec F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 5c3a5e3c1e6c3f8ccabeb414e18dce64e6f3e797de225ee93034f2c9e76f289c -F src/shell.c.in cbb7ae029cea6d8789924d9009574081b4f3c0619ce736ed36e8c7564ef13547 +F src/shell.c.in 423a188b63a2fbdb968bd4af23b50e4c11522c2594f70d35db785c267303d933 F src/sqlite.h.in e2915e4a86d5e0783afb5cb72411df38d987c7f3c5aa2d5441b8e74d30b649d8 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca @@ -1270,7 +1270,7 @@ F test/hook.test 2d89bf9480646feb8093be3a58ea502d6521906779ed960de31dd9c4502c054 F test/hook2.test b9ff3b8c6519fb67f33192f1afe86e7782ee4ac8 F test/icu.test 8da7d52cd9722c82f33b0466ed915460cb03c23a38f18a9a2d3ff97da9a4a8c0 F test/ieee754.test 0d3ab84ab2069c9994c833a7cd820ee6037f0cf888e206a4a7fc05f735d5790a -F test/import01.sql 11a5f8325b8b04c66fe489d30558d462411432adf750cef1c0f7b06564691a8c +F test/import01.sql d9561059f4ad3f14eff20c269e64b09afd697b1aad00b03a7d5010e167dcba83 F test/imposter1.sql fc5ad0945bb19622688c7a1cd7dfd1cefa4b013bac9e2628c22b03c7309f021f F test/imposter1.test 5a20b2cdeb53e65fc57cdb10a33750bd4ef6259909eaf1972253b9e79f7a3fb2 F test/in.test edf979bff3244b9e47849e2b43886631354c8213791f42da92216f08012141af @@ -2200,8 +2200,9 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P af0bf4ee7778359d96b43605d947b44bbcef9f489732d0890103992cd970c3b5 -R e19642c370ddc04db7feae1ef11b22a4 +P 96818a375ad1d421b26e6c0be61be70735659e294f2cf7c073f8851d8c309430 +Q +a6a347aec5ff33b24d877ac0f04018f4e93748361da62ed27b1abec77840963e +R fd6d475d7c1637c3f62566715e085b08 U drh -Z ec27d88e0cab74feb97c7d80c8a6f2f7 +Z 9fcc8bfde4a6b51472b4728226576119 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 47b4dbf770..1b33a31564 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -96818a375ad1d421b26e6c0be61be70735659e294f2cf7c073f8851d8c309430 +e14e19c1b33b4f4fe7d9008b0f7f8fa9522d901c13124b0eca4b91acd7156d0d diff --git a/src/shell.c.in b/src/shell.c.in index edb0af950e..a39415193e 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -7252,7 +7252,7 @@ SELECT CASE WHEN (nc < 10) THEN 1 WHEN (nc < 100) THEN 2 \ SELECT\ '('||x'0a'\ || group_concat(\ - cname||' ANY',\ + cname,\ ','||iif((cpos-1)%4>0, ' ', x'0a'||' '))\ ||')' AS ColsSpec \ FROM (\ diff --git a/test/import01.sql b/test/import01.sql index 6e029b8b27..9c041528ce 100644 --- a/test/import01.sql +++ b/test/import01.sql @@ -119,12 +119,12 @@ END .testcase 141 SELECT sql FROM sqlite_schema WHERE name='t1'; .check <