]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
In QRF, relax the constraint on the screen width so that it can be as
authordrh <>
Thu, 14 May 2026 12:46:41 +0000 (12:46 +0000)
committerdrh <>
Thu, 14 May 2026 12:46:41 +0000 (12:46 +0000)
wide as a 32-bit signed integer can count.
[forum:/forumpost/2570051b60|Forum post 2570051b60].

FossilOrigin-Name: 91439d95dc81adebf8226f2b7c33ca62a4b7163cfc14e03993524aa17b5767f3

ext/qrf/qrf.c
ext/qrf/qrf.h
manifest
manifest.uuid

index 098d91f9283045b9d788528f6647348751cd7a44..4e3b8723321521606e4f204842069b3e4cc2c0c0 100644 (file)
@@ -2746,7 +2746,7 @@ static void qrfInitialize(
   memcpy(&p->spec, pSpec, sz);
   if( p->spec.zNull==0 ) p->spec.zNull = "";
   p->mxWidth = p->spec.nScreenWidth;
-  if( p->mxWidth<=0 ) p->mxWidth = QRF_MAX_WIDTH;
+  if( p->mxWidth<=0 ) p->mxWidth = 2147483647;
   p->mxHeight = p->spec.nLineLimit;
   if( p->mxHeight<=0 ) p->mxHeight = 2147483647;
   if( p->spec.eStyle>QRF_STYLE_Table ) p->spec.eStyle = QRF_Auto;
index e5171b01a01dbf3acbab69f25f27ca2fe6262120..7ba9149242e0520b861e8d2e8d0280a709195d1b 100644 (file)
@@ -70,8 +70,7 @@ int sqlite3_format_query_result(
 );
 
 /*
-** Range of values for sqlite3_qrf_spec.aWidth[] entries and for
-** sqlite3_qrf_spec.mxColWidth and .nScreenWidth
+** Range of values for sqlite3_qrf_spec.aWidth[] entries.
 */
 #define QRF_MAX_WIDTH    10000
 #define QRF_MIN_WIDTH    0
index 6cbbbe84ac2352e44b48970c2eefa0f707a71258..518ff2f6e6eb7fb51612d51a0cb84ee889ec67ef 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Raise\san\serror\sif\san\sALTER\sTABLE\sADD\sCOLUMN\sstatement\stries\sto\sadd\na\sCHECK\sconstraint\sthat\scontains\san\sinternal-use-only\sSQL\sfunction.
-D 2026-05-14T11:35:17.064
+C In\sQRF,\srelax\sthe\sconstraint\son\sthe\sscreen\swidth\sso\sthat\sit\scan\sbe\sas\nwide\sas\sa\s32-bit\ssigned\sinteger\scan\scount.\n[forum:/forumpost/2570051b60|Forum\spost\s2570051b60].
+D 2026-05-14T12:46:41.607
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -423,8 +423,8 @@ F ext/misc/zipfile.c 5a583b5e72b4d777dc9f845529e6bd185d58024b633aafc93588679c787
 F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee
 F ext/qrf/README.md 9e644615d7d7b77ef7e9db798765679e50c5ed12eda48bce21c9ef9eb4715e9d
 F ext/qrf/dev-notes.md e68a6d91ce4c7eb296ef2daadc2bb79c95c317ad15b9fafe40850c67b29c2430
-F ext/qrf/qrf.c 9bd4ad396e75a7905b1eb956ac53fd93f77942963c5ffac176ae39880368553b
-F ext/qrf/qrf.h fbb223ff5789b324b3e9c22e787e4c1f53e217cff7cc5a243164d4b2e8410f4b
+F ext/qrf/qrf.c a022bcfb9c936ba5257e1e637146f2a7d3e850319bba35fda8a8179d0f1059e6
+F ext/qrf/qrf.h 7a832022bc3f40dc09fff1cb6f18025395a19313de090265a4a1d22bb9b400be
 F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8
 F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255
 F ext/rbu/rbu10.test 7c22caa32c2ff26983ca8320779a31495a6555737684af7aba3daaf762ef3363
@@ -2205,9 +2205,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 58472fdab0691f7f03f15201542f15148ed7734bfeb495370386d666ae4beded 28272746fb13dcdbe2a4f21ef30446c316dfc843aa3d48f135f490abaee34198
-R be54508c26f77b87ecf3592d32b88b83
-T +closed 28272746fb13dcdbe2a4f21ef30446c316dfc843aa3d48f135f490abaee34198
+P 52dd437d51d3c1af0777350daeebf1159033eede3f58fcc5ebaeaec8869ffaff
+R 0ac368fe653982cb58aa5110e82ff16d
 U drh
-Z 8e8eed3622a63562b8ca5f42232ad615
+Z 5e0583ded9ec751434acafae92224280
 # Remove this line to create a well-formed Fossil manifest.
index eefa62d0e89fce1ef50f146c6c04684b5a43c89b..a31eb28ab7b41c694f13611c4a7a02ae487e39b8 100644 (file)
@@ -1 +1 @@
-52dd437d51d3c1af0777350daeebf1159033eede3f58fcc5ebaeaec8869ffaff
+91439d95dc81adebf8226f2b7c33ca62a4b7163cfc14e03993524aa17b5767f3