From: drh <drh@noemail.net>
Date: Mon, 25 Jun 2007 12:49:05 +0000 (+0000)
Subject: All the use of MySQL-style quoting in the FTS modules.  Ticket #2446. (CVS 4119)
X-Git-Tag: version-3.6.10~2055
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5665b3ea446fc521a208e94d606df90f1a9b795a;p=thirdparty%2Fsqlite.git

All the use of MySQL-style quoting in the FTS modules.  Ticket #2446. (CVS 4119)

FossilOrigin-Name: 3be2a6d1c342454d93b05c38f3d9a960ab15dae2
---

diff --git a/ext/fts1/fts1.c b/ext/fts1/fts1.c
index 0d931eca19..cdc4711542 100644
--- a/ext/fts1/fts1.c
+++ b/ext/fts1/fts1.c
@@ -1564,6 +1564,7 @@ static int getToken(const char *z, int *tokenType){
       *tokenType = TOKEN_SPACE;
       return i;
     }
+    case '`':
     case '\'':
     case '"': {
       int delim = z[0];
diff --git a/ext/fts2/fts2.c b/ext/fts2/fts2.c
index 549adc2eef..d96673d0a2 100644
--- a/ext/fts2/fts2.c
+++ b/ext/fts2/fts2.c
@@ -2402,6 +2402,7 @@ static int getToken(const char *z, int *tokenType){
       *tokenType = TOKEN_SPACE;
       return i;
     }
+    case '`':
     case '\'':
     case '"': {
       int delim = z[0];
diff --git a/manifest b/manifest
index 79b99c20b0..0b378fb272 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stest\sthat\scalls\sfts2_tokenizer()\swith\san\sargument\sset\svia\sC\scode.\s(CVS\s4118)
-D 2007-06-25T12:05:40
+C All\sthe\suse\sof\sMySQL-style\squoting\sin\sthe\sFTS\smodules.\s\sTicket\s#2446.\s(CVS\s4119)
+D 2007-06-25T12:49:06
 F Makefile.in 7f7485a4cc039476a42e534b3f26ec90e2f9753e
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -24,7 +24,7 @@ F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
 F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
 F ext/fts1/ft_hash.h 1a35e654a235c2c662d3ca0dfc3138ad60b8b7d5
-F ext/fts1/fts1.c 1ee986c31a7080d509602fa182738c5a8862fbff
+F ext/fts1/fts1.c b51a4e2712a29ade1ccf2300ca293819e9f17b86
 F ext/fts1/fts1.h 6060b8f62c1d925ea8356cb1a6598073eb9159a6
 F ext/fts1/fts1_hash.c 3196cee866edbebb1c0521e21672e6d599965114
 F ext/fts1/fts1_hash.h 957d378355ed29f672cd5add012ce8b088a5e089
@@ -37,7 +37,7 @@ F ext/fts1/simple_tokenizer.c 1844d72f7194c3fd3d7e4173053911bf0661b70d
 F ext/fts1/tokenizer.h 0c53421b832366d20d720d21ea3e1f6e66a36ef9
 F ext/fts2/README.tokenizers 2ff290e0a130f6e7611f2e608cb3b5aaea721abc
 F ext/fts2/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts2/fts2.c 841766f2f14d68e623404f9531d98afa0f7cbf05
+F ext/fts2/fts2.c d402141bd339f8d5881c05c9104959fbcf039ccb
 F ext/fts2/fts2.h 591916a822cfb6426518fdbf6069359119bc46eb
 F ext/fts2/fts2_hash.c b3f22116d4ef0bc8f2da6e3fdc435c86d0951a9b
 F ext/fts2/fts2_hash.h e283308156018329f042816eb09334df714e105e
@@ -515,7 +515,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P b79ced3e0a26b0db13613073c847c2d2ba7e174e
-R bd43a4e803b49844e3492af252e992ad
-U danielk1977
-Z c0d7af5f5f203b9a840aeab00383f3fd
+P fbcf2d75cd2b88d175c122477aa483f0771870e5
+R 6b15629d97d8ed3f199946758b4a6655
+U drh
+Z 8a6ebd38b49bd3fa6b3ff4c5ba27fa44
diff --git a/manifest.uuid b/manifest.uuid
index 77e655ccfc..11723dcd49 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fbcf2d75cd2b88d175c122477aa483f0771870e5
\ No newline at end of file
+3be2a6d1c342454d93b05c38f3d9a960ab15dae2
\ No newline at end of file