Additional test cases.

FossilOrigin-Name: 733d81c3a6a513b0b893a7d14894f36aebbbca9da375c326db8a72df4f0c6238

diff --git a/manifest b/manifest
index 95ed26d2415ba4955eb3681627cf8adde8244894..89b1c257a5d45057a25f159cfd2efb4319e472df 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\scases\sfor\ssqlite3_vtab_in()\sand\ssqlite3_vtab_distinct().
-D 2022-02-02T19:15:53.331
+C Additional\stest\scases.
+D 2022-02-02T19:30:24.554
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -731,7 +731,7 @@ F test/bestindex4.test 3039894f2dad50f3a68443dffad1b44c9b067ac03870102df1ce3d9a4
 F test/bestindex5.test a0c90b2dad7836e80a01379e200e5f8ec9476d49b349af02c0dbff2fb75dc98d
 F test/bestindex6.test 16942535b551273f3ad9df8d7cc4b7f22b1fcd8882714358859eb049a6f99dd4
 F test/bestindex7.test f094c669a6400777f4d2ddc3ed28e39169f1adb5be3d59b55f22ccf8c414b71e
-F test/bestindex8.test 025477dd9bdb462f4faef3dd8838306f4e230620677778f4fe27e6736789e1b8
+F test/bestindex8.test abd0016fc04f19dc382976750b06df5463d2757e11e78a8ba7d7dc50671f3337
 F test/between.test b9a65fb065391980119e8a781a7409d3fcf059d89968279c750e190a9a1d5263
 F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
 F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
@@ -1943,8 +1943,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 c99df4ab5db2c32b044366c5b0ac70fd8887d1456d53323e75fede23cc61c236
-R 73bbb4581fa3d24d1ee5b28ca166750f
+P 21afb81d0a73af39aacd9329b1441faa2b535a52a52036daec89fd303a8b344f
+R bd0b74bd91f16e8219ac183cf658cda6
 U drh
-Z 0537364a2100dee8e5b21a6d334bfbef
+Z 4de6a8e85d90e316804149623317b18b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ef067148571d3e72e4efb835196d455686168ae9..e0d2343378784acfed0d759c114deb876bd2991d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-21afb81d0a73af39aacd9329b1441faa2b535a52a52036daec89fd303a8b344f
\ No newline at end of file
+733d81c3a6a513b0b893a7d14894f36aebbbca9da375c326db8a72df4f0c6238
\ No newline at end of file

diff --git a/test/bestindex8.test b/test/bestindex8.test
index a9cc56a8069f0ea8fc409c6aa1e53281ccf680eb..68164007710fa7057536d9d590815761a36c6a3a 100644 (file)
--- a/test/bestindex8.test
+++ b/test/bestindex8.test
@@ -49,7 +49,7 @@ proc vtab_command {src method args} {
       } {
         lappend ret orderby 1
         lappend ret idxnum 1
-        #puts "ORDER-BY-CONSUMED"
+        set ::lOrderByConsumed 1
       }
       return $ret
     }
@@ -78,22 +78,22 @@ do_execsql_test 1.0 {
   INSERT INTO t0(c0) VALUES (1), (0);
 }
 
-foreach {tn sql bDistinct idxinsert res} {
-  1 "SELECT a, b FROM vt1"                              0 0 {a b c d a b c d}
-  2 "SELECT DISTINCT a, b FROM vt1"                     2 1 {a b c d}
-  3 "SELECT DISTINCT a FROM vt1"                        2 1 {a c}
-  4 "SELECT DISTINCT b FROM vt1"                        2 1 {b d}
-  5 "SELECT DISTINCT b FROM vt1 ORDER BY a"             0 1 {b d}
-  6 "SELECT DISTINCT t0.c0 FROM vt1, t0 ORDER BY vt1.a" 0 1 {1 0}
-  7 "SELECT DISTINCT a, b FROM vt1 ORDER BY a, b"       1 0 {a b c d}
-  8 "SELECT DISTINCT a, b FROM vt1 ORDER BY a"          0 1 {a b c d}
-  9 "SELECT DISTINCT a FROM vt1 ORDER BY a, b"          0 1 {a c}
-
- 10 "SELECT DISTINCT a, b FROM vt1 WHERE b='b'"         2 1 {a b}
- 11 "SELECT DISTINCT a, b FROM vt1 WHERE +b='b'"        2 1 {a b}
+foreach {tn sql bDistinct idxinsert bConsumed res} {
+  1 "SELECT a, b FROM vt1"                              0 0 0 {a b c d a b c d}
+  2 "SELECT DISTINCT a, b FROM vt1"                     2 1 1 {a b c d}
+  3 "SELECT DISTINCT a FROM vt1"                        2 1 1 {a c}
+  4 "SELECT DISTINCT b FROM vt1"                        2 1 0 {b d}
+  5 "SELECT DISTINCT b FROM vt1 ORDER BY a"             0 1 1 {b d}
+  6 "SELECT DISTINCT t0.c0 FROM vt1, t0 ORDER BY vt1.a" 0 1 1 {1 0}
+  7 "SELECT DISTINCT a, b FROM vt1 ORDER BY a, b"       1 0 1 {a b c d}
+  8 "SELECT DISTINCT a, b FROM vt1 ORDER BY a"          0 1 1 {a b c d}
+  9 "SELECT DISTINCT a FROM vt1 ORDER BY a, b"          0 1 1 {a c}
+
+ 10 "SELECT DISTINCT a, b FROM vt1 WHERE b='b'"         2 1 1 {a b}
+ 11 "SELECT DISTINCT a, b FROM vt1 WHERE +b='b'"        2 1 1 {a b}
 } {
   set ::lBestIndexDistinct ""
-if {$tn==10} breakpoint
+  set ::lOrderByConsumed 0
   do_execsql_test 1.$tn.1 $sql $res
   do_test 1.$tn.2 {
     set ::lBestIndexDistinct
@@ -101,6 +101,9 @@ if {$tn==10} breakpoint
   do_test 1.$tn.3 {
     expr {[lsearch [execsql "explain $sql"] IdxInsert]>=0}
   } $idxinsert
+  do_test 1.$tn.4 {
+    set ::lOrderByConsumed
+  } $bConsumed
 }
 
 #-------------------------------------------------------------------------