Flesh out the break-as-null test cases to better demonstrate how it compares to the...

FossilOrigin-Name: ad1ae76ad1209a2a63a1d8c4ac2ab536f3446d81c6ddffaebbd0bc578ed38833

diff --git a/manifest b/manifest
index bde4822b93a73677046e48c3129176568325f3f2..ffdf5b9bc207fb7284a4e5b2032fe89afe38bf22 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sTcl-defined\sUDFs\sto\s'break'\sto\sresult\sin\san\sSQL\sNULL,\sas\sper\ssuggestion\sin\s[forum:585ebac2c48f1411|forum\spost\s585ebac2c48f1411].
-D 2025-05-05T16:49:16.878
+C Flesh\sout\sthe\sbreak-as-null\stest\scases\sto\sbetter\sdemonstrate\show\sit\scompares\sto\sthe\sdefault\sof\sreturning\san\sempty\sstring.
+D 2025-05-05T17:13:15.361
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1725,7 +1725,7 @@ F test/tabfunc01.test 8a484fe8b19fc24844f72ca1ceb7c9ae8c9a6bca000a5c6ccab5d89f5c
 F test/table.test e87294bf1c80bfd7792142b84ab32ea5beb4f3f71e535d7fb263a6b2068377bf
 F test/tableapi.test e37c33e6be2276e3a96bb54b00eea7f321277115d10e5b30fdb52a112b432750
 F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
-F test/tclsqlite.test 7ca1af2b2db4d36f5f853ac5408d1fcbb17c4751c421953d8be6320b34ba5ed8
+F test/tclsqlite.test 0d0a1192a1d79057c30387868cbb662134331ec34180a341caac506c80202070
 F test/tempdb.test 4cdaa23ddd8acb4d79cbb1b68ccdfd09b0537aaba909ca69a876157c2a2cbd08
 F test/tempdb2.test 353864e96fd3ae2f70773d0ffbf8b1fe48589b02c2ec05013b540879410c3440
 F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
@@ -2207,11 +2207,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 38d4c94d8c7802101ef3bfb411002f9497fdbbbd2b4d3514cef5b76ffd66f75b
-R d84cf2b8dde8ffbdca8896f454df8fbd
-T *branch * tcl-cw
-T *sym-tcl-cw *
-T -sym-trunk * Cancelled\sby\sbranch.
+P 034211985da244a7e6544cb57a3273fb99e5939d6c3446ec3afc1c2d84b5ec98
+R 87bf710f552e5f13081622f9297236f4
 U stephan
-Z ec5156f3d6619e2e3e084b033e0d009a
+Z 90e0a56bb258ad6e4bfaa00f875858d4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 81db4b122b05b20dad067d7ff3439bf2cb5448c1..0cce53780ea7e98de7794481e727f07e2a176378 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-034211985da244a7e6544cb57a3273fb99e5939d6c3446ec3afc1c2d84b5ec98
+ad1ae76ad1209a2a63a1d8c4ac2ab536f3446d81c6ddffaebbd0bc578ed38833

diff --git a/test/tclsqlite.test b/test/tclsqlite.test
index 0761a191f1cb8a961ad52b24710880f9470ebf1d..b2b00212dadfc0c4e0a58cf0a01192fb4e3c0a8a 100644 (file)
--- a/test/tclsqlite.test
+++ b/test/tclsqlite.test
@@ -358,15 +358,17 @@ do_test tcl-9.3 {
   db function ret_int {return [expr {int(rand()*200)}]}
   execsql {SELECT typeof(ret_int())}
 } {integer}
-proc breakAsNullUdf args {return -code break}
+proc breakAsNullUdf args {
+  if {"1" eq [lindex $args 0]} {return -code break}
+}
 do_test tcl-9.4 {
   db function banu breakAsNullUdf
-  execsql {SELECT typeof(banu())}
-} {null}
+  execsql {SELECT typeof(banu()), typeof(banu(1))}
+} {text null}
 do_test tcl-9.5 {
   db nullvalue banunull
-  db eval {SELECT 1, banu(), 3}
-} {1 banunull 3}
+  db eval {SELECT banu(), banu(1)}
+} {{} banunull}
 
 
 # Recursive calls to the same user-defined function