From: drh <>
Date: Tue, 7 Jan 2025 12:14:32 +0000 (+0000)
Subject: Make the TCL extension aware of the booleanString type within TCL.
X-Git-Tag: major-relase~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4717d573e44db999b305902a68c4bd83bd14f713;p=thirdparty%2Fsqlite.git

Make the TCL extension aware of the booleanString type within TCL.

FossilOrigin-Name: 14b38ae6ab86a314a63ca9513850b43fcc670864f94d03a2706eff469980da88
---

diff --git a/manifest b/manifest
index ecfcaef04e..8e3fb1f0fe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\sprevious\scheck-in.
-D 2025-01-07T11:54:43.065
+C Make\sthe\sTCL\sextension\saware\sof\sthe\sbooleanString\stype\swithin\sTCL.
+D 2025-01-07T12:14:32.905
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -787,7 +787,7 @@ F src/sqliteInt.h 3f20dfb5ae54e787b2643edc0b5bae0cecddfb89988e28afdc3c0b05892e25
 F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523
 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
-F src/tclsqlite.c 9004ed7a517e106087f70d2ec54a2a6819e55765151fa53d0d2cd408e698f99e
+F src/tclsqlite.c 6e25a72d3f3769f779b05b2c618ae0388639d8e27d6434c2ff3926f3267342fe
 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
 F src/test1.c 7f5579f2786c11cf4391ec2abb7b5b5b234ca1408599d7a0d6dd32360e5f58d8
 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
@@ -2205,8 +2205,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P dd934f032fa6fc790a951006512e3ed76a5f2930858932918eafdbe3ceec4620
-R 1ccf02cc09665431fcc21407330e398e
+P 7d41885e85b0e2ef28bac34d663af07c35b21ee3e8b14481d2371f623bce681d
+R 7defba456aa3fec0b02242de054d2a9a
 U drh
-Z c9e32c83a7281ddac240e198b5bce057
+Z 915ad0926614914c31505681a5658ee7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c4fbf1e0c3..4f85e88e04 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d41885e85b0e2ef28bac34d663af07c35b21ee3e8b14481d2371f623bce681d
+14b38ae6ab86a314a63ca9513850b43fcc670864f94d03a2706eff469980da88
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 21437909ba..344b3e07c7 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -1098,6 +1098,7 @@ static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value**argv){
         ** has no string representation. */
         eType = SQLITE_BLOB;
       }else if( (c=='b' && strcmp(zType,"boolean")==0)
+             || (c=='b' && strcmp(zType,"booleanString")==0 && pVar->bytes==0)
              || (c=='w' && strcmp(zType,"wideInt")==0)
              || (c=='i' && strcmp(zType,"int")==0) 
       ){
@@ -1505,7 +1506,9 @@ static int dbPrepareAndBind(
           sqlite3_bind_blob(pStmt, i, data, n, SQLITE_STATIC);
           Tcl_IncrRefCount(pVar);
           pPreStmt->apParm[iParm++] = pVar;
-        }else if( c=='b' && strcmp(zType,"boolean")==0 ){
+        }else if( (c=='b' && strcmp(zType,"boolean")==0)
+               || (c=='b' && strcmp(zType,"booleanString")==0
+                          && pVar->bytes==0) ){
           int nn;
           Tcl_GetIntFromObj(interp, pVar, &nn);
           sqlite3_bind_int(pStmt, i, nn);