Enhance the xBestIndex method on delta_parse() to return SQLITE_CONSTRAINT if

no delta argument is supplied.

FossilOrigin-Name: f16d127c3b4a735afae1fc236bcf90f31adff079c7d3a896f901d908ff8b8532

diff --git a/ext/misc/fossildelta.c b/ext/misc/fossildelta.c
index d1b5a2c6a051a262d8eb11ffd1a02ad141bf2dd0..7a9c5c1d728530caa73d20f96dd94d281dbceb59 100644 (file)
--- a/ext/misc/fossildelta.c
+++ b/ext/misc/fossildelta.c
@@ -974,7 +974,7 @@ static int deltaparsevtabBestIndex(
   pIdxInfo->idxNum = 0;
   pIdxInfo->estimatedCost = (double)0x7fffffff;
   pIdxInfo->estimatedRows = 0x7fffffff;
-  return SQLITE_OK;
+  return SQLITE_CONSTRAINT;
 }
 
 /*

diff --git a/manifest b/manifest
index 3affb0af3f178cf375cbefa2c5f1cd75a8bf6d34..eb13e2dec5f4d9802d0a950a2184d8afd9d0983e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sdelta_parse(DELTA)\stable-valued\sfunction\sto\sthe\sfossildelta\nextension.
-D 2019-02-19T20:19:51.952
+C Enhance\sthe\sxBestIndex\smethod\son\sdelta_parse()\sto\sreturn\sSQLITE_CONSTRAINT\sif\nno\sdelta\sargument\sis\ssupplied.
+D 2019-02-19T20:29:05.526
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4
@@ -286,7 +286,7 @@ F ext/misc/dbdump.c baf6e37447c9d6968417b1cd34cbedb0b0ab3f91b5329501d8a8d5be3287
 F ext/misc/eval.c 4b4757592d00fd32e44c7a067e6a0e4839c81a4d57abc4131ee7806d1be3104e
 F ext/misc/explain.c d5c12962d79913ef774b297006872af1fccda388f61a11d37758f9179a09551f
 F ext/misc/fileio.c 592d6531d8413d81b25f5a47a45d7e310e455d33e03a64c6ae85724c6524a5d5
-F ext/misc/fossildelta.c 990fcc25a41be22c648d3e362f5d4616562869c613e75790bf71fa7c54d029fa
+F ext/misc/fossildelta.c 31b64084789228ac0d1113e5e39dc79c2ae16dd131d5c988ad9550ae1b9bc4b4
 F ext/misc/fuzzer.c 9e79c337faffdd4c5fe4485467537438359b43e0858a40038d4300b894ff553f
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
 F ext/misc/json1.c 8af4672f43634257dbcfdb4515b4070325463d67c6968b4be1bd414de28d4d58
@@ -1805,7 +1805,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 b80cafa6f8a5c6ff1dc9efd2f670777ab131ace2df1eb431cedc8cfa901baf18
-R 28b47243faa86a15a5dab72f9f6d43db
+P d91fcc267bf1be795dfdb1fbfb40c2aea79ddff247a51d26462136c325b7a6d3
+R c6e533968a2ece3b69b351a227132130
 U drh
-Z 704f00932f29d8380bf4a3f8f9e7b2af
+Z d8453dece5a7987c62030d39d3c1b091

diff --git a/manifest.uuid b/manifest.uuid
index 57af7c8c3067e2743e05e589d72fbdd48eae41fa..f9ba20353f0818c1c856d32caf14688185b233ff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d91fcc267bf1be795dfdb1fbfb40c2aea79ddff247a51d26462136c325b7a6d3
\ No newline at end of file
+f16d127c3b4a735afae1fc236bcf90f31adff079c7d3a896f901d908ff8b8532
\ No newline at end of file