From f63bc3a92259b63e502fc37c7c3bc4e9941ff3df Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 23 Nov 2025 10:55:38 +0000 Subject: [PATCH] New test case for bSplitColumn in QRF. FossilOrigin-Name: 6d01f9f49eef5f7d4bddadc458691b6ca36e277bae1d4b43b60a128a44e3faca --- manifest | 11 +- manifest.uuid | 2 +- test/qrf04.test | 750 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 757 insertions(+), 6 deletions(-) create mode 100644 test/qrf04.test diff --git a/manifest b/manifest index 99a136399b..564cb28982 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\sQRF\sin\sbSplitColumn\smode,\sincrease\sthe\sspacing\sbetween\scolumns\sto\sbe\sas\nwide\sas\sfive,\sfor\simproved\slegibility,\sif\sscreen\swidth\sallows. -D 2025-11-23T00:45:47.805 +C New\stest\scase\sfor\sbSplitColumn\sin\sQRF. +D 2025-11-23T10:55:38.669 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -1512,6 +1512,7 @@ F test/pushdown.test 46a626ef1c0ca79b85296ff2e078b9da20a50e9b804b38f441590c39875 F test/qrf01.test a6ecc051613ea4dde796e4ff20fdb2c59a2138faf926d90a2a92c1e291776617 F test/qrf02.test 39b4afdc000bedccdafc0aecf17638df67a67aaa2d2942865ae6abcc48ba0e92 F test/qrf03.test 9de53aea459f5a127283db03cbb6011500757685646d21aa3c29c44c6ef23e86 +F test/qrf04.test 0894692c998d2401dcc33449c02051b503ecce0c94217be54fb007c82d2d1379 F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca F test/quick.test 1681febc928d686362d50057c642f77a02c62e57 F test/quickcheck.test a4b7e878cd97e46108291c409b0bf8214f29e18fddd68a42bc5c1375ad1fb80a @@ -2178,8 +2179,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b73df612b621699cd58de6ef327fefdeb8f52eb620f0d2df00d38ff6608a8dd5 -R 21cb4fdd07b535e967358e7f11ed0f3e +P 673648cc812e1549c2b3e7749306e7395d0b7e396a7d5ac432948eb3a6c3713f +R b07cade1b53255f8485d393775aba3a9 U drh -Z 22bfdb54bd9f215342f9c6ccdefd6051 +Z 810fd1ddb73ce7b8ee1038ab0bad873b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 14341ea2c8..8c4b51ac69 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -673648cc812e1549c2b3e7749306e7395d0b7e396a7d5ac432948eb3a6c3713f +6d01f9f49eef5f7d4bddadc458691b6ca36e277bae1d4b43b60a128a44e3faca diff --git a/test/qrf04.test b/test/qrf04.test new file mode 100644 index 0000000000..0b231d921b --- /dev/null +++ b/test/qrf04.test @@ -0,0 +1,750 @@ +# 2025-11-23 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# Test cases for the Query Result Formatter (QRF), and especially +# the bSplitColumn feature. +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +set testprefix qrf01 + +# The expected output from test 1.1. The "do_test" procedure normally +# ignores differences in whitespace, but whitespace is important for +# this test, so we have to do the comparison ourselves. +# +set expected { +<---- 22 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 23 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 24 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 25 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 26 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 27 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 28 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 29 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 30 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 31 ----> +alice +bob +cinderella-cinderella +daniel +emma +fred +gertrude +harold +ingrid +jake +lisa +mike +nina +octavian +paula +quintus +rita +sam +tammy +ulysses +violet +william +xanthippe +yates +zoe +<---- 32 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 33 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 34 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 35 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 36 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 37 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 38 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 39 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 40 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 41 ----> +alice octavian +bob paula +cinderella-cinderella quintus +daniel rita +emma sam +fred tammy +gertrude ulysses +harold violet +ingrid william +jake xanthippe +lisa yates +mike zoe +nina +<---- 42 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 43 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 44 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 45 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 46 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 47 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 48 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 49 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 50 ----> +alice jake tammy +bob lisa ulysses +cinderella-cinderella mike violet +daniel nina william +emma octavian xanthippe +fred paula yates +gertrude quintus zoe +harold rita +ingrid sam +<---- 51 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 52 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 53 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 54 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 55 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 56 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 57 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 58 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 59 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 60 ----> +alice harold paula william +bob ingrid quintus xanthippe +cinderella-cinderella jake rita yates +daniel lisa sam zoe +emma mike tammy +fred nina ulysses +gertrude octavian violet +<---- 61 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 62 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 63 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 64 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 65 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 66 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 67 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 68 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 69 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 70 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 71 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 72 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 73 ----> +alice fred lisa quintus violet +bob gertrude mike rita william +cinderella-cinderella harold nina sam xanthippe +daniel ingrid octavian tammy yates +emma jake paula ulysses zoe +<---- 74 ----> +alice emma ingrid nina rita violet zoe +bob fred jake octavian sam william +cinderella-cinderella gertrude lisa paula tammy xanthippe +daniel harold mike quintus ulysses yates +<---- 75 ----> +alice emma ingrid nina rita violet zoe +bob fred jake octavian sam william +cinderella-cinderella gertrude lisa paula tammy xanthippe +daniel harold mike quintus ulysses yates +<---- 76 ----> +alice emma ingrid nina rita violet zoe +bob fred jake octavian sam william +cinderella-cinderella gertrude lisa paula tammy xanthippe +daniel harold mike quintus ulysses yates +<---- 77 ----> +alice emma ingrid nina rita violet zoe +bob fred jake octavian sam william +cinderella-cinderella gertrude lisa paula tammy xanthippe +daniel harold mike quintus ulysses yates +<---- 78 ----> +alice emma ingrid nina rita violet zoe +bob fred jake octavian sam william +cinderella-cinderella gertrude lisa paula tammy xanthippe +daniel harold mike quintus ulysses yates +<---- 79 ----> +alice emma ingrid nina rita violet zoe +bob fred jake octavian sam william +cinderella-cinderella gertrude lisa paula tammy xanthippe +daniel harold mike quintus ulysses yates +<---- 80 ----> +alice emma ingrid nina rita violet zoe +bob fred jake octavian sam william +cinderella-cinderella gertrude lisa paula tammy xanthippe +daniel harold mike quintus ulysses yates +} + +do_test 1.0 { + db eval { + CREATE TABLE t1(x); + INSERT INTO t1(x) VALUES + ('alice'), + ('bob'), + ('cinderella-cinderella'), + ('daniel'), + ('emma'), + ('fred'), + ('gertrude'), + ('harold'), + ('ingrid'), + ('jake'), + ('lisa'), + ('mike'), + ('nina'), + ('octavian'), + ('paula'), + ('quintus'), + ('rita'), + ('sam'), + ('tammy'), + ('ulysses'), + ('violet'), + ('william'), + ('xanthippe'), + ('yates'), + ('zoe'); + } + set res \n + for {set i 22} {$i<=80} {incr i} { + set sp [expr {$i-13}] + append res [format "<----%*s%3d%*s---->\n" \ + [expr {$sp/2}] {} $i [expr {$sp-$sp/2}] {}] + append res [db format -style column -title off \ + -screenwidth $i -splitcolumn on \ + {SELECT x FROM t1 ORDER BY x ASC}] + } + expr {$res eq $::expected} +} {1} -- 2.47.3