From: drh <> Date: Sat, 22 Nov 2025 21:34:33 +0000 (+0000) Subject: In QRF, change the name of the bWrapSnglCol flag to bSplitColumn. X-Git-Tag: artiphishell~201 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=946857cfee7ea6b203bfbe14fc56a761b3330f37;p=thirdparty%2Fsqlite.git In QRF, change the name of the bWrapSnglCol flag to bSplitColumn. Similar changes to the TCL interface. FossilOrigin-Name: 76512b3b80fdcaae22340cde0b69857e2a4d7e86a63c6759465bd8a0bcbf82bc --- diff --git a/ext/qrf/qrf.c b/ext/qrf/qrf.c index 07a771242a..bd1f43c9ba 100644 --- a/ext/qrf/qrf.c +++ b/ext/qrf/qrf.c @@ -1510,11 +1510,11 @@ static int *qrfValidLayout( } /* -** The output is single-column and the bWrapSnglCol flag is set. +** The output is single-column and the bSplitColumn flag is set. ** Check to see if the single-column output can be split into multiple ** columns that appear side-by-side. Adjust pData appropriately. */ -static void qrfWrapSingleColumn(qrfColData *pData, Qrf *p){ +static void qrfSplitColumn(qrfColData *pData, Qrf *p){ int nCol = 1; int *aw = 0; char **az = 0; @@ -1785,15 +1785,15 @@ static void qrfColumnar(Qrf *p){ } if( nColumn==1 - && p->spec.bWrapSnglCol==QRF_Yes + && p->spec.bSplitColumn==QRF_Yes && p->spec.eStyle==QRF_STYLE_Column && p->spec.bTitles==QRF_No && p->spec.nScreenWidth>data.a[0].w+3 ){ /* Attempt to convert single-column tables into multi-column by ** verticle wrapping, if the screen is wide enough and if the - ** bWrapSnglCol flag is set. */ - qrfWrapSingleColumn(&data, p); + ** bSplitColumn flag is set. */ + qrfSplitColumn(&data, p); nColumn = data.nCol; }else{ /* Adjust the column widths due to screen width restrictions */ diff --git a/ext/qrf/qrf.h b/ext/qrf/qrf.h index 5dc5f8f3af..43e7b4cc11 100644 --- a/ext/qrf/qrf.h +++ b/ext/qrf/qrf.h @@ -37,7 +37,7 @@ struct sqlite3_qrf_spec { unsigned char bTextNull; /* Apply eText encoding to zNull[] */ unsigned char eDfltAlign; /* Default alignment, no covered by aAlignment */ unsigned char eTitleAlign; /* Alignment for column headers */ - unsigned char bWrapSnglCol; /* Wrap single-column output into many columns */ + unsigned char bSplitColumn; /* Wrap single-column output into many columns */ short int nWrap; /* Wrap columns wider than this */ short int nScreenWidth; /* Maximum overall table width */ short int nLineLimit; /* Maximum number of lines for any row */ diff --git a/manifest b/manifest index f43e4e12e1..5d9e5bfcaa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Cherrypick\s[0b53be562f1e]\sinto\strunk. -D 2025-11-22T19:29:23.738 +C In\sQRF,\schange\sthe\sname\sof\sthe\sbWrapSnglCol\sflag\sto\sbSplitColumn.\nSimilar\schanges\sto\sthe\sTCL\sinterface. +D 2025-11-22T21:34:33.872 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -417,8 +417,8 @@ F ext/misc/windirent.h 02211ce51f3034c675f2dbf4d228194d51b3ee05734678bad5106fff6 F ext/misc/zipfile.c 09e6e3a3ff40a99677de3c0bc6569bd5f4709b1844ac3d1c1452a456c5a62f1c F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee F ext/qrf/README.md dd565fd1ca0c46ea37dbf4d496e368b9ecade768c92669640bc106e039629016 -F ext/qrf/qrf.c f388bd56d8f9804511fa0b3d704cca648084d05f716525f48fdaea8be761d7c7 -F ext/qrf/qrf.h 116f9d7847c04f6377d40cd22dd2b1c6a1336a26201dfe6d69b1d58ec41d02e7 +F ext/qrf/qrf.c 032b61e09ace375674d27789688a957ee38518850b0fa588b6cf828850f62345 +F ext/qrf/qrf.h bccc9d1c1b6a05fa0da56332bba29d85782318926f022c849114a63da916393f F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8 F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255 F ext/rbu/rbu10.test 7c22caa32c2ff26983ca8320779a31495a6555737684af7aba3daaf762ef3363 @@ -743,7 +743,7 @@ F src/sqliteInt.h a89c3a9296928dffcb4c287df176a739f9cf620c7c9d33aec59e8efb9b39cb F src/sqliteLimit.h 0a5516b4ec192a205c541e05f67009028a9451dc6678aae4cf8e68596903c246 F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 -F src/tclsqlite.c caceb8b872d414479a1df3715e565bc9a486cb5763dcf639ad4ff84550d19dc4 +F src/tclsqlite.c f5aca78b32b2ba823a6dc7dbb9b2272c93e0f71df2f93104d5a61a6348f3b115 F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a F src/test1.c 0e71fbcb484a271564e98e0158192c28c24f5521594218c3ba48bcb4cf634f91 F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff @@ -1509,7 +1509,7 @@ F test/printf2.test 3f55c1871a5a65507416076f6eb97e738d5210aeda7595a74ee895f2224c F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc F test/pushdown.test 46a626ef1c0ca79b85296ff2e078b9da20a50e9b804b38f441590c3987580ddd -F test/qrf01.test 92334aaf93e0b96dbb117c9592f2ec7385e9077e65db16a175ec352f4d754ef3 +F test/qrf01.test a6ecc051613ea4dde796e4ff20fdb2c59a2138faf926d90a2a92c1e291776617 F test/qrf02.test 39b4afdc000bedccdafc0aecf17638df67a67aaa2d2942865ae6abcc48ba0e92 F test/qrf03.test 9de53aea459f5a127283db03cbb6011500757685646d21aa3c29c44c6ef23e86 F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca @@ -2178,9 +2178,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 7a9e753e977ff61ceee50c4e0e5f9b1fc179e91acd9ac88378c888b3e45ebe3a -Q +0b53be562f1e1a5b20ffe8d72df64e753a8d759b580d949a0f32409144769bb0 -R 6b41e05d002f0141056b46261fec76ea -U stephan -Z d4ab66d88c009cde0ce3adf3b09c51ba +P e86e5723d778721b10c1c908545c56233d4d5549a7ca3b7cf8ca649c70450add +R c278c68620939f77d4c5109a74d315c3 +U drh +Z 8f5356e6748187a83683b995483e2110 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index efdd4a276c..3134b65b77 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e86e5723d778721b10c1c908545c56233d4d5549a7ca3b7cf8ca649c70450add +76512b3b80fdcaae22340cde0b69857e2a4d7e86a63c6759465bd8a0bcbf82bc diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 036de64f6e..01e6a962a2 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -2063,7 +2063,7 @@ static void DbHookCmd( ** -wordwrap ("auto"|"off"|"on") Try to wrap at word boundry? ** -textjsonb ("auto"|"off"|"on") Auto-convert JSONB to text? ** -textnull ("auto"|"off"|"on") Use text encoding for -null. -** -wrapsnglcol ("auto"|"off"|"on") Enable wrap-single-column +** -splitcolumn ("auto"|"off"|"on") Enable split-column mode ** -defaultalign ("auto"|"left"|...) Default alignment ** -titalalign ("auto"|"left"|"right"|...) Default column name alignment ** -wrap NUMBER Max width of any single column @@ -2090,7 +2090,7 @@ static void DbHookCmd( ** -wordwrap bWordWrap ** -textjsonb bTextJsonb ** -textnull bTestNull -** -wrapsnglcol bWrapSnglCol +** -splitcolumn bSplitColumn ** -defaultalign eDfltAlign ** -titlealign eTitleAlign ** -wrap nWrap @@ -2240,7 +2240,7 @@ static int dbQrf(SqliteDb *pDb, int objc, Tcl_Obj *const*objv){ i++; }else if( strcmp(zArg,"-textjsonb")==0 || strcmp(zArg,"-textnull")==0 - || strcmp(zArg,"-wrapsnglcol")==0 + || strcmp(zArg,"-splitcolumn")==0 ){ int v = 0; rc = Tcl_GetIndexFromObj(pDb->interp, objv[i+1], azBool, @@ -2251,7 +2251,7 @@ static int dbQrf(SqliteDb *pDb, int objc, Tcl_Obj *const*objv){ }else if( zArg[5]=='n' ){ qrf.bTextNull = aBoolMap[v]; }else{ - qrf.bWrapSnglCol = aBoolMap[v]; + qrf.bSplitColumn = aBoolMap[v]; } i++; }else if( strcmp(zArg,"-defaultalign")==0 || strcmp(zArg,"-titlealign")==0){ diff --git a/test/qrf01.test b/test/qrf01.test index 81f1fc3a05..3f8b989b76 100644 --- a/test/qrf01.test +++ b/test/qrf01.test @@ -926,7 +926,7 @@ do_test 10.1 { ('yates'), ('zoe'); } - set result "\n[db format -style column -title off -screenwidth 41 -wrapsnglcol on \ + set result "\n[db format -style column -title off -screenwidth 41 -splitcolumn on \ {SELECT x FROM t1}]" } { alice octavian @@ -944,7 +944,7 @@ mike zoe nina } do_test 10.2 { - set result "\n[db format -style column -title off -screenwidth 42 -wrapsnglcol on \ + set result "\n[db format -style column -title off -screenwidth 42 -splitcolumn on \ {SELECT x FROM t1}]" } { alice jake tammy @@ -958,7 +958,7 @@ harold rita ingrid sam } do_test 10.3 { - set result "\n[db format -style column -title off -screenwidth 51 -wrapsnglcol on \ + set result "\n[db format -style column -title off -screenwidth 51 -splitcolumn on \ {SELECT x FROM t1}]" } { alice harold paula william @@ -970,7 +970,7 @@ fred nina ulysses gertrude octavian violet } do_test 10.4 { - set result "\n[db format -style column -title off -screenwidth 61 -wrapsnglcol on \ + set result "\n[db format -style column -title off -screenwidth 61 -splitcolumn on \ {SELECT x FROM t1}]" } { alice fred lisa quintus violet @@ -980,7 +980,7 @@ daniel ingrid octavian tammy yates emma jake paula ulysses zoe } do_test 10.5 { - set result "\n[db format -style column -title off -screenwidth 74 -wrapsnglcol on \ + set result "\n[db format -style column -title off -screenwidth 74 -splitcolumn on \ {SELECT x FROM t1}]" } { alice emma ingrid nina rita violet zoe