Empty queries should get no results. My recent change

( http://www.sqlite.org/cvstrac/chngview?cn=3486 ) broke test fts2a-5.3.
This change should make the expected result more obvious. (CVS 3489)

FossilOrigin-Name: cde383eb467de0d752e94a22cd2f890c2dc599cc

diff --git a/ext/fts2/fts2.c b/ext/fts2/fts2.c
index eb303aa0f6426c6c5378dd67656a33421cc74245..772e6ce04422fb8eb9f6a6f2a0322fd707bb13be 100644 (file)
--- a/ext/fts2/fts2.c
+++ b/ext/fts2/fts2.c
@@ -3289,6 +3289,12 @@ static int fulltextQuery(
   rc = parseQuery(v, zInput, nInput, iColumn, pQuery);
   if( rc!=SQLITE_OK ) return rc;
 
+  /* Empty or NULL queries return no results. */
+  if( pQuery->nTerms==0 ){
+    dataBufferInit(pResult, 0);
+    return SQLITE_OK;
+  }
+
   /* Merge AND terms. */
   /* TODO(shess) I think we can early-exit if( i>nNot && left.nData==0 ). */
   aTerm = pQuery->pTerms;

diff --git a/manifest b/manifest
index 4d5d02d7ab1af2f4372c0ebddffe06a6a882b0fb..a7ec8a77963c0dcae8c5db513ad9dc97eee0b59d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\smemset()\suses\sless\serror-prone.\nhttp://www.sqlite.org/cvstrac/tktview?tn=2036,35\sdescribes\ssome\scases\nwhere\swe\swere\spassing\smemset()\sa\slength\swhich\swas\sthe\ssizeof\sa\npointer,\srather\sthan\sthe\sstructure\spointed\sto.\s\sInstead,\swrap\sthis\nidiom\sup\sin\sCLEAR()\sand\sSCRAMBLE()\smacros.\s(CVS\s3488)
-D 2006-10-26T00:04:31
+C Empty\squeries\sshould\sget\sno\sresults.\s\sMy\srecent\schange\n(\shttp://www.sqlite.org/cvstrac/chngview?cn=3486\s)\sbroke\stest\sfts2a-5.3.\nThis\schange\sshould\smake\sthe\sexpected\sresult\smore\sobvious.\s(CVS\s3489)
+D 2006-10-26T00:41:51
 F Makefile.in 4379c909d46b38b8c5db3533084601621d4f14b2
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -33,7 +33,7 @@ F ext/fts1/fulltext.h 08525a47852d1d62a0be81d3fc3fe2d23b094efd
 F ext/fts1/simple_tokenizer.c 1844d72f7194c3fd3d7e4173053911bf0661b70d
 F ext/fts1/tokenizer.h 0c53421b832366d20d720d21ea3e1f6e66a36ef9
 F ext/fts2/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts2/fts2.c bee8988db6a97104d86ad7e025f1b6e80e4aa41a
+F ext/fts2/fts2.c 10fe8d96a95ad09814d4a06049385b60b204e3a9
 F ext/fts2/fts2.h bbdab26d34f91974d5b9ade8b7836c140a7c4ce1
 F ext/fts2/fts2_hash.c b3f22116d4ef0bc8f2da6e3fdc435c86d0951a9b
 F ext/fts2/fts2_hash.h e283308156018329f042816eb09334df714e105e
@@ -419,7 +419,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 2d3b22197c7c06488b789cce333b34b6d1ae39aa
-R c18224b43b58b956ecd0a15ea9ad3008
+P 5878add0839f9c5bec77caae2361ec20cb60b48b
+R 3d9ce122beb09a00cd3fd7137dd66557
 U shess
-Z 69630a14b82d73d5314cd0d1d7882fb7
+Z 4dba001cc239d0747f6caf0a916f48ed

diff --git a/manifest.uuid b/manifest.uuid
index 2657b2c17ba294a85d8b81b05d300d8f8bdbee63..725fdfedc8a2d6251a24a4f91277e112a29ca828 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5878add0839f9c5bec77caae2361ec20cb60b48b
\ No newline at end of file
+cde383eb467de0d752e94a22cd2f890c2dc599cc
\ No newline at end of file