From: drh <> Date: Sun, 31 May 2026 09:38:28 +0000 (+0000) Subject: Fiddle should default to using NO_COLOR since the JS console does not X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=7437c19a0155200f26a08027fe256923c0762668;p=thirdparty%2Fsqlite.git Fiddle should default to using NO_COLOR since the JS console does not support ANSI X3.64. FossilOrigin-Name: bde6190fdeb530bfb92524ab5542f3f4b64adf31c31de1e00fe4430a8e00411f --- diff --git a/manifest b/manifest index 913e88768d..e9312ed3be 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sformat()\sSQL\sfunction\sso\sthat\sit\sreports\sTOOBIG\sand\sNOMEM\serrors.\nFix\sa\spossible\sinteger\soverflow\son\s%#Q\sformatting.\n[bugs:/info/2026-05-31T02:00:07Z|Bug\s2026-05-31T02:00:07Z]. -D 2026-05-31T09:18:31.445 +C Fiddle\sshould\sdefault\sto\susing\sNO_COLOR\ssince\sthe\sJS\sconsole\sdoes\snot\nsupport\sANSI\sX3.64. +D 2026-05-31T09:38:28.434 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -738,7 +738,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 7e936a09405cb59e2b3e51a3ad23753e4803afc5269c5171a54c9bdd70f4fc50 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 4c05cde130f26991b7411d8c6809e0630625e18078742c963a047b4b9cc01d49 -F src/shell.c.in a04d063955a69449e5bd876956ba14cf69a897eda1f5477862ab6f2bbf0d3852 +F src/shell.c.in 710fcfafabceccf7969d92848f44bc3e779aa889dfc501102aa19b5fece9848c F src/sqlite.h.in 749454ec71c875bc130d399ff9a7e47191d143d1b9d8b4af3839b6028df9eda9 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e @@ -2207,8 +2207,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 2c605bfb1562d7a3609ad6ffd7446def12f1ac7084e41b9c6723e998c156501d -R 63a7961695da01d8633721e28ccdef08 +P 3bfe0510aecccf113b9d008c308fca3096e9c45c59b919c0b91bb4703415988f +R a43f83a50659207a0b743838aff1f1d6 U drh -Z 074783b25a8da3f2d8a55cfec0466688 +Z 9b6c8f7faccb4e824ffe0d745cae5843 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index be1ecf48ba..9a66389597 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3bfe0510aecccf113b9d008c308fca3096e9c45c59b919c0b91bb4703415988f +bde6190fdeb530bfb92524ab5542f3f4b64adf31c31de1e00fe4430a8e00411f diff --git a/src/shell.c.in b/src/shell.c.in index 38888bf1a6..8011e2b9a2 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -934,7 +934,7 @@ static char *local_getline(char *zLine, FILE *in){ ** or if the NO_COLOR environment variable exists */ static int shellNoColor(void){ -#ifdef SQLITE_NO_COLOR +#if defined(SQLITE_NO_COLOR) || defined(SQLITE_SHELL_FIDDLE) return 1; #else return getenv("NO_COLOR")!=0;