When a virtual table reports orderByConsumed, that tells us nothing about

whether or not the SQLITE_DISTINCTBY constraint is met.
Fix for ticket [7e59041f9c4e5102].
Test cases in TH3.

FossilOrigin-Name: b59f94e4da9b1653f2004b214407a50340dd476b27e6ec7e29e501a95db9c963

diff --git a/manifest b/manifest
index 465b28edbb5e359ad7e425ccb2b790f4b385b877..ced639718b8bf961b0a88201229b97fab4cc9754 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sxferCompatibleIndex()\sfunction\sso\sthat\sit\srecognizes\sthat\sa\sPRIMARY\sKEY\nindex\sfor\sa\sWITHOUT\sROWID\stable\sis\sdifferent\sfrom\sa\sUNIQUE\sconstraint\sindex\non\sthe\sprimary\skey.\s\sTicket\s[302027baf1374498]
-D 2019-11-07T14:51:24.956
+C When\sa\svirtual\stable\sreports\sorderByConsumed,\sthat\stells\sus\snothing\sabout\nwhether\sor\snot\sthe\sSQLITE_DISTINCTBY\sconstraint\sis\smet.\nFix\sfor\sticket\s[7e59041f9c4e5102].\nTest\scases\sin\sTH3.
+D 2019-11-08T20:13:44.344
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -612,7 +612,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c bbd6838bd79c0a32144d482fb0b6a9d2d1a252fb3b16d5005ec30f2f80413b0d
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c d5a94907dcac990e31976be9dc769d17f6a806782593d6aec9d760ee01ec22cd
-F src/where.c 6e56bef94dc1e2d4461fca49604602312dc620333572aad9511e5ca2120aff31
+F src/where.c 874845fb5d93b3bc07123df8fee805e9650bd091e3ed62988273c7e2141ab8bd
 F src/whereInt.h 4a296fd4fa79fdcbc2b5e8c1b898901617655811223e1082b899c23ecb092217
 F src/wherecode.c 9b84737fd68134249a439813d27b1c61de17a01e121eb98949548d1e7f8e400a
 F src/whereexpr.c 0705f608f6dbbd4e95d440528d6c760b91b6f402ba4eb8b8d964c110e2010780
@@ -1849,7 +1849,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 104a2beb57037f9353ffa77096aae0eb64e4682e667f31623bfd3d064dd8d881
-R c8b53b705fa0400a6763ef7952da070a
+P 34f64f11ca481996b1ff1686bdc5e278946635b6856cd1fe2355fce8e298e0f8
+R 31de4c083b648ffd51f71fd6244bffef
 U drh
-Z 1a2695a1ff301ea728b819cbcc928cab
+Z 28abf6e2f78150740c50123f02de8e33

diff --git a/manifest.uuid b/manifest.uuid
index 59ba87321130978d089e106bd71c60c4b1811401..f175b311ea854a375dd8af2914b5725a1af693e8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-34f64f11ca481996b1ff1686bdc5e278946635b6856cd1fe2355fce8e298e0f8
\ No newline at end of file
+b59f94e4da9b1653f2004b214407a50340dd476b27e6ec7e29e501a95db9c963
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index ffae7a6f4f7d50d7e140bbe0f977bef9e43c4f38..2a32d54edd0fa2058de7d76d4507adff88532aad 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3696,7 +3696,9 @@ static i8 wherePathSatisfiesOrderBy(
       pLoop = pLast;
     }
     if( pLoop->wsFlags & WHERE_VIRTUALTABLE ){
-      if( pLoop->u.vtab.isOrdered ) obSat = obDone;
+      if( pLoop->u.vtab.isOrdered && (wctrlFlags & WHERE_DISTINCTBY)==0 ){
+        obSat = obDone;
+      }
       break;
     }else if( wctrlFlags & WHERE_DISTINCTBY ){
       pLoop->u.btree.nDistinctCol = 0;