Adjust 3 query result expectations to reflect changed group_concat() behavior with...

FossilOrigin-Name: 86f9c07a4fbbba1efb413f84f337d4b80539f3909913b2f5d9c4b86654e8fac4

diff --git a/manifest b/manifest
index ec727c32115c954e0d2465979a558766441af234..ea174cb9aa9521d7858ca61780ef3b78317cdd7b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\swindowed\sgroup_concat()\sby\sallowing\sa\schange\sin\sundocumented\sbehavior\s(fails\ssome\snew\stests)
-D 2021-09-30T17:20:23.080
+C Adjust\s3\squery\sresult\sexpectations\sto\sreflect\schanged\sgroup_concat()\sbehavior\swith\svarying\sseparator.
+D 2021-09-30T21:42:56.551
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -645,7 +645,7 @@ F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
 F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
-F test/aggnested.test cc47afa5e11e0d6771a85a4993fa6ff721480ddb53ea538ec3fdbafb720bd505
+F test/aggnested.test a755b9e42c9ab151cb037b2a8e75bfd6e561b9bfbfc6dc36bb4988d1aac7d94a
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 2ecb8bbd52416642e41c9081182a8df05d42c75637afd4488aace78cc4b69e13
 F test/alter.test f53d8a4ecd35f051c07e54a36beec5d0a30d30a9d98bc723f6cde6afbfb3c5ca
@@ -1040,7 +1040,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 77f6ea02c97d9ea64074461d347276a75df22d2cf51045a40f90857569e985f0
+F test/func.test 2d84a919fe063b50ebe28ffc0a2b2b845692349007ba73f40d9568254bb13dcc
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test 600a632c305a88f3946d38f9a51efe145c989b2e13bd2b2a488db47fe76bab6a
 F test/func4.test 2285fb5792d593fef442358763f0fd9de806eda47dbc7a5934df57ffdc484c31
@@ -1799,7 +1799,7 @@ F test/window8.tcl 5e02e41d9d9a80f597063aed1a381eb19d1d0ef677a4f0df352c5365cf23f
 F test/window8.test 4ab16817414af0c904abe2ebdf88eb6c2b00058b84f9748c6174ff11fc45f1ed
 F test/window9.test 349c71eab4288a1ffc19e2f65872ec2c37e6cf8a1dda2ad300364b7450ae4836
 F test/windowA.test 6d63dc1260daa17141a55007600581778523a8b420629f1282d2acfc36af23be
-F test/windowB.test b67bda5645f3226790e1a360c4225241840b84adb5aa2e69bfb0b27eef3b84d9
+F test/windowB.test cb96e42def6fb00a5d74a49079e756a106678ef0f09bae4753944338e60627cb
 F test/windowC.test 1e290a18ffaf406b6da7a7be90a4ec17cc39624413055274406b4a4dece019fb
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
 F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3cc1819b
@@ -1929,7 +1929,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a4c18b2f0ce4a0f4d0c4f4c25dc69fbed4cb4876d2b69e3e5e0e756410892d74 7d16b302826fec3606dbc6e20df0d2182f6946a2ed4076d2412d1df30c552ecb
-R 7a3fb3a8eabd209987f42e1233885851
+P 9d8e6167380cdb8520e4893e36862450b8bbe990f33668b5546dec32eab41df9
+R 13a6ced210d825c6aadf5b9a5a0f5baf
 U larrybr
-Z 2579a77f1b00e3b217e06a6d591fd46d
+Z ea3c08c26ece7b1db5af199831ae8aee

diff --git a/manifest.uuid b/manifest.uuid
index 394b3ec54a78ef969aec3ee663f5b26578d1c5d7..e33ec2bc61751be20c48c6849633249af7063f49 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d8e6167380cdb8520e4893e36862450b8bbe990f33668b5546dec32eab41df9
\ No newline at end of file
+86f9c07a4fbbba1efb413f84f337d4b80539f3909913b2f5d9c4b86654e8fac4
\ No newline at end of file

diff --git a/test/aggnested.test b/test/aggnested.test
index 35d5f1e3a68b2de74d4dbb6e1c365bbbe8509d88..f6696e1dc2d99d2c1afa6c599e8ac47d7d0f46b1 100644 (file)
--- a/test/aggnested.test
+++ b/test/aggnested.test
@@ -44,7 +44,7 @@ do_test aggnested-1.4 {
   db eval {
     SELECT (SELECT group_concat(a1,b1) FROM t2) FROM t1;
   }
-} {151 252 353}
+} {141 242 343}
 
 
 # This test case is a copy of the one in

diff --git a/test/func.test b/test/func.test
index 38c0037735ee58de29691f4c9573c0970a358a9b..f25d41f3689ac3bb2a662db70f5e0c6d0a0276aa 100644 (file)
--- a/test/func.test
+++ b/test/func.test
@@ -1145,7 +1145,7 @@ do_test func-24.3 {
   execsql {
     SELECT group_concat(t1,' ' || rowid || ' ') FROM tbl1
   }
-} {{this 2 program 3 is 4 free 5 software}}
+} {{this 1 program 2 is 3 free 4 software}}
 do_test func-24.4 {
   execsql {
     SELECT group_concat(NULL,t1) FROM tbl1

diff --git a/test/windowB.test b/test/windowB.test
index 52221c445c387684130e807c3e53392043622e77..7b08674b2cac50146b320f1ff3c22bb81c59073d 100644 (file)
--- a/test/windowB.test
+++ b/test/windowB.test
@@ -363,6 +363,6 @@ do_execsql_test 9.0 {
   SELECT group_concat('-', x)
     OVER ( ORDER BY x ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING )
   FROM seps;
-} {-22- -22-333- -333-4444- -4444-}
+} {-1- -1-22- -22-333- -333-}
 
 finish_test