Fix octet_length() test cases so that they work when the database encoding

is utf16.

FossilOrigin-Name: ad2e39626e6115fd322ef9495ae3bcd91343d7131a725f1bf24211a51a21dcc2

diff --git a/manifest b/manifest
index 501658de52e023d35985db37c29561ebd74cb012..8cab6ecd4a037a7ca9e0c3edf7f8efb87e0cdd92 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\sKahan-Babushka-Neumaier\salgorithm\sto\simprove\sthe\saccuracy\sof\ssum().
-D 2023-07-06T15:44:38.951
+C Fix\soctet_length()\stest\scases\sso\sthat\sthey\swork\swhen\sthe\sdatabase\sencoding\nis\sutf16.
+D 2023-07-06T17:14:47.377
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1109,7 +1109,7 @@ F test/fts4umlaut.test fcaca4471de7e78c9d1f7e8976e3e8704d7d8ad979d57a739d00f3f75
 F test/fts4unicode.test 82a9c16b68ba2f358a856226bb2ee02f81583797bc4744061c54401bf1a0f4c9
 F test/fts4upfrom.test f25835162c989dffd5e2ef91ec24c4848cc9973093e2d492d1c7b32afac1b49d
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
-F test/func.test f246a12169d1b0dbebcf70bb4ad0324b12e8fdbfbbbcc1c92379c7088014c602
+F test/func.test 2acd982669b2c15ceccc046385b458e985f90c9ca58b14d0ef75eec79c32f45b
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test 600a632c305a88f3946d38f9a51efe145c989b2e13bd2b2a488db47fe76bab6a
 F test/func4.test 2285fb5792d593fef442358763f0fd9de806eda47dbc7a5934df57ffdc484c31
@@ -2043,9 +2043,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9427f42687ed6d97c474bf42d0c3e82d6f4b0075e74206adcb5699d72e32140e e3f7a960c9bd8e84cd70f0585bb955d043604a92001d0e2bf6c1216bb1fd7221
-R fc07faedc8ec40abb250af878f96b89f
-T +closed e3f7a960c9bd8e84cd70f0585bb955d043604a92001d0e2bf6c1216bb1fd7221
+P c63e26e705f5e967e14ef6aea8ce226548293ad8d25066069f29fa89673913d2
+R 53ca4618f6c32fdbf6e515373f138d99
 U drh
-Z d5a624e7df2c6f31ea17c42fd16ebd48
+Z fbdc8f38e0cbbe60844dd0d57718e977
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index abd1499c5d370bfaebf0a0baf042f80851f6a7fd..9612f356e4f5145937a3367eefab09f1a7bfedf5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c63e26e705f5e967e14ef6aea8ce226548293ad8d25066069f29fa89673913d2
\ No newline at end of file
+ad2e39626e6115fd322ef9495ae3bcd91343d7131a725f1bf24211a51a21dcc2
\ No newline at end of file

diff --git a/test/func.test b/test/func.test
index d2b1b36cb5a99908edc0ccb9ce22d72c3cdd0419..3d71060465f5c32a72e5b4862a11039f87bbaf71 100644 (file)
--- a/test/func.test
+++ b/test/func.test
@@ -42,9 +42,10 @@ do_test func-0.1 {
 do_test func-1.0 {
   execsql {SELECT length(t1) FROM tbl1 ORDER BY t1}
 } {4 2 7 8 4}
+set isutf16 [regexp 16 [db one {PRAGMA encoding}]]
 do_execsql_test func-1.0b {
   SELECT octet_length(t1) FROM tbl1 ORDER BY t1;
-} {4 2 7 8 4}
+} [expr {$isutf16?"8 4 14 16 8":"4 2 7 8 4"}]
 do_test func-1.1 {
   set r [catch {execsql {SELECT length(*) FROM tbl1 ORDER BY t1}} msg]
   lappend r $msg
@@ -62,14 +63,14 @@ do_test func-1.4 {
 } {1 -1 3 -1 5}
 do_execsql_test func-1.5 {
   SELECT octet_length(12345);
-} {5}
+} [expr {(1+($isutf16!=0))*5}]
 db null NULL
 do_execsql_test func-1.6 {
   SELECT octet_length(NULL);
 } {NULL}
 do_execsql_test func-1.7 {
   SELECT octet_length(7.5);
-} {3}
+} [expr {(1+($isutf16!=0))*3}]
 do_execsql_test func-1.8 {
   SELECT octet_length(x'30313233');
 } {4}