The new "format" method in the TCL interface is now partially functional.

FossilOrigin-Name: ace1ebda08740bb248c009cc4a6c99da318a2bba3e43ef20bd0c365c5021705f

diff --git a/ext/qrf/qrf.c b/ext/qrf/qrf.c
index efcea7241382327585b035dfa3a27fde2fad6681..2e4916db76b90dad3114c7fde9a2c7b0a18546cd 100644 (file)
--- a/ext/qrf/qrf.c
+++ b/ext/qrf/qrf.c
@@ -1131,7 +1131,7 @@ static void qrfColumnar(Qrf *p){
           sqlite3_str_reset(aCol[i]);
           qrfRenderValue(p, aCol[i], i);
           uz = (unsigned char*)sqlite3_str_value(aCol[i]);
-          if( uz==0 ){ qrfOom(p); goto qrf_column_end; }
+          if( uz==0 ) uz = (unsigned char*)"";
         }
         azData[k] = qrfTableCell(p, uz, &azNextLine[i], wx, bw);
         if( p->iErr ) goto qrf_column_end;

diff --git a/manifest b/manifest
index 3c8f15a6894b4e3699041e95a230b1d7aaec12f5..0fb2d18ad8f540efbbd6ff087263a4a5f9961711 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\sbuild\sproduct\s"tclsqlite-ex.c"\sis\sthe\stclsqlite.c\sfile\swith\sQRF\sadded.\nThis\sis\snow\sused\swhereever\stclsqlite.c\swas\sused.\s\sHence\sQRF\sis\snow\sin\sthe\ntestfixture\sand\sin\sthe\stclextension.\s\sThe\ssqlite3\smethod\sis\s"format".\s\sThat\nmethod\sis\scurrently\sjust\sa\snon-functional\sstub.
-D 2025-11-05T12:37:42.695
+C The\snew\s"format"\smethod\sin\sthe\sTCL\sinterface\sis\snow\spartially\sfunctional.
+D 2025-11-05T14:07:16.182
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -418,7 +418,7 @@ F ext/misc/zipfile.c 09e6e3a3ff40a99677de3c0bc6569bd5f4709b1844ac3d1c1452a456c5a
 F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee
 F ext/qrf/README.md 1aa6f58a9442d329eff1d890dd33f565df636a47d8d0e878dbbf5c0ecba3b4c3
 F ext/qrf/qrf-tester.c 3a733b25a25ba7390cd3df055edd76ac72f488a9c5d9eb523a7508b0b8ac8900
-F ext/qrf/qrf.c 7c6a70ab5439a45b4d89f8121f1845a877f4e1d28889ed1fd92ce85ad60ed796
+F ext/qrf/qrf.c 02b67fdd18903ff31ee6df545cc6816d55405c53deaec8c193afb7d9435a49db
 F ext/qrf/qrf.h 701ddceb12e6b7957eeb4d77d057fddb66328840c189514b35daf27d1edb3a0e
 F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8
 F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255
@@ -744,7 +744,7 @@ F src/sqliteInt.h 88f7fc9ce1630d9a5f7e0a8e1f3287cdc63882fba985c18e7eee1b9f457f59
 F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
 F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
-F src/tclsqlite.c 0e88871f97e5d3116024804690e5f92db950411577c9042be8f02e4a22ba9d08
+F src/tclsqlite.c dbf58baacccc93ad413f6afbd10436c99c737ad9613fd04d4d6d3fcab1895166
 F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
 F src/test1.c f880ab766eeedf2c063662bd9538b923fd42c4341b7bfc2150a6d93ab8b9341c
 F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
@@ -2155,7 +2155,7 @@ F tool/split-sqlite3c.tcl 4969fd642dad0ea483e4e104163021d92baf98f6a8eac981fe4852
 F tool/sqldiff.c 134be7866be19f8beb32043d5aea5657f01aaeae2df8d33d758ff722c78666b9
 F tool/sqlite3_analyzer.c.in 14f02cb5ec3c264cd6107d1f1dad77092b1cf440fc196c30b69ae87b56a1a43b
 F tool/sqlite3_rsync.c d0e58a1e49fe2192c3ee0b697aed182d502bebfe5b4b406ba6b2baa52a04ecbe
-F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
+F tool/sqltclsh.c.in c103c6fc7d42bce611f9d4596774d60b7ef3d0b291a1f58c9e6184e458b89296
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
 F tool/src-verify.c 6c655d9a8d6b30f3648fc78a79bf3838ed68f8543869d380c43ea9f17b3b8501
 F tool/srcck1.c 559e703c6cca1d70398bdba1d7f91036c1a71adf718a1aaa6401a562ccaed154
@@ -2172,8 +2172,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 bed60e9be6d7f33c9f20dbb98bebdfaa7226a949a8e06691aea4d1e7c1af9507
-R a279d58d28b91b8b51c7e42c98a82ff3
+P e08d21fe1365176f268f1dcca4048fb5ff043356e5817c8622b4ed9a1a5a58cf
+R 396eb99826668e7bea68d6dbddbadb5d
 U drh
-Z bc1252b29d805c5af10d1a6ff0d03432
+Z 00c395c0339b4e9e4eacf1741e0dac01
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f37ecb18646cc7957e97e54c3d67dd45319812e4..de69168d966efe4b5e6ad38a349482d094e69660 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e08d21fe1365176f268f1dcca4048fb5ff043356e5817c8622b4ed9a1a5a58cf
+ace1ebda08740bb248c009cc4a6c99da318a2bba3e43ef20bd0c365c5021705f

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index a66d9f0077a12aa5df8c2e25e419815fc0e884db..844fbe533ef821e8e7ba1ea333e564c31b2c65c5 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -2054,10 +2054,92 @@ static void DbHookCmd(
 static int dbQrf(SqliteDb *pDb, int objc, Tcl_Obj *const*objv){
 #ifndef SQLITE_QRF_H
   Tcl_SetResult(pDb->interp, "QRF not available in this build", TCL_VOLATILE);
-  return TCL_ERROR
+  return TCL_ERROR;
 #else
-  Tcl_SetResult(pDb->interp, "Not yet implemented", TCL_VOLATILE);
+  char *zResult = 0;             /* Result to be returned */
+  const char *zSql = 0;          /* SQL to run */
+  int i;                         /* Loop counter */
+  sqlite3_str *pPrior = 0;       /* Prior results */
+  int rc;                        /* Result code */
+  sqlite3_qrf_spec qrf;          /* Formatting spec */
+
+  memset(&qrf, 0, sizeof(qrf));
+  qrf.iVersion = 1;
+  qrf.eStyle = QRF_STYLE_Box;
+  qrf.pzOutput = &zResult;
+  for(i=2; i<objc; i++){
+    const char *zArg = Tcl_GetString(objv[i]);
+    if( zArg[0]!='-' && zSql==0 ){
+      zSql  = zArg;
+    }else if( strcmp(zArg,"-style")==0 && i<objc-1 ){
+      static const char *azStyles[] = {
+        "box",            "column",           "count",
+        "csv",            "eqp",              "explain", 
+        "html",           "insert",           "json",
+        "line",           "list",             "markdown",
+        "quote",          "scanexp",          "table"
+      };
+      static unsigned char aStyleMap[] = {
+        QRF_STYLE_Box,    QRF_STYLE_Column,   QRF_STYLE_Count,
+        QRF_STYLE_Csv,    QRF_STYLE_EQP,      QRF_STYLE_Explain,
+        QRF_STYLE_Html,   QRF_STYLE_Insert,   QRF_STYLE_Json,
+        QRF_STYLE_Line,   QRF_STYLE_List,     QRF_STYLE_Markdown,
+        QRF_STYLE_Quote,  QRF_STYLE_ScanExp,  QRF_STYLE_Table
+      };
+      int style;
+      if( Tcl_GetIndexFromObj(pDb->interp, objv[i+1], azStyles,
+                              "format style", 0, &style) ) return SQLITE_ERROR;
+      qrf.eStyle = aStyleMap[style];
+      i++;
+    }else{
+      Tcl_AppendResult(pDb->interp, "unknown argument: ", zArg, (char*)0);
+      return TCL_ERROR;
+    }
+  }
+  while( zSql && zSql[0] ){
+    const char *zNext;                 /* Next statement after current */
+    SqlPreparedStmt *pStmt = 0;        /* Next statement to run */
+    char *zErr = 0;                    /* Error message from QRF */
+
+    rc = dbPrepareAndBind(pDb, zSql, &zNext, &pStmt);
+    if( rc ) goto format_failed;
+    if( zResult ){
+      if( pPrior==0 ){
+        pPrior = sqlite3_str_new(pDb->db);
+        if( pPrior==0 ) goto format_oom;
+      }
+      sqlite3_str_appendall(pPrior, zResult);
+      zResult = 0;
+    }
+    rc = sqlite3_format_query_result(pStmt->pStmt, &qrf, &zErr);
+    dbReleaseStmt(pDb, pStmt, 0);
+    if( rc ){
+      Tcl_SetResult(pDb->interp, zErr, TCL_VOLATILE);
+      sqlite3_free(zErr);
+      rc = TCL_ERROR;
+      goto format_failed;
+    }
+    zSql = zNext;
+  }
+
+  if( pPrior ){
+    sqlite3_str_appendall(pPrior, zResult);
+    sqlite3_free(zResult);
+    zResult = sqlite3_str_finish(pPrior);
+    pPrior = 0;
+  }
+  Tcl_SetResult(pDb->interp, zResult, TCL_VOLATILE);
+  sqlite3_free(zResult);
   return TCL_OK;
+
+format_oom:
+  Tcl_AppendResult(pDb->interp, "out of memory", (char*)0);
+
+format_failed:
+  if( zResult ) sqlite3_free(zResult);
+  if( pPrior ) sqlite3_free(sqlite3_str_finish(pPrior));
+  return rc;
+
 #endif
 }
 

diff --git a/tool/sqltclsh.c.in b/tool/sqltclsh.c.in
index da354ee9357b801c7d0709b14364599b0558a9ff..3e4d38b2dae6b7874c3361f27a9bab6be2a84f99 100644 (file)
--- a/tool/sqltclsh.c.in
+++ b/tool/sqltclsh.c.in
@@ -33,7 +33,7 @@ INCLUDE $ROOT/ext/misc/appendvfs.c
 INCLUDE $ROOT/ext/misc/zipfile.c
 INCLUDE $ROOT/ext/misc/sqlar.c
 #endif
-INCLUDE $ROOT/src/tclsqlite.c
+INCLUDE tclsqlite-ex.c
 
 const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
   (void)interp;