From: danielk1977 <danielk1977@noemail.net>
Date: Wed, 20 Jun 2007 06:23:54 +0000 (+0000)
Subject: Fix snippet generation when the left-most column of an fts2 table is used in the... 
X-Git-Tag: version-3.6.10~2079
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86889fc3c6d192385174fbc8f2efce659bf82821;p=thirdparty%2Fsqlite.git

Fix snippet generation when the left-most column of an fts2 table is used in the MATCH clause. Fix for ticket #2429. (CVS 4095)

FossilOrigin-Name: fec56ad2ede53e3e202d9ad869a059eeb315796f
---

diff --git a/ext/fts2/fts2.c b/ext/fts2/fts2.c
index 6315151a97..3a5ae4565a 100644
--- a/ext/fts2/fts2.c
+++ b/ext/fts2/fts2.c
@@ -3105,7 +3105,7 @@ static void snippetAllOffsets(fulltext_cursor *p){
   if( p->q.nTerms==0 ) return;
   pFts = p->q.pFts;
   nColumn = pFts->nColumn;
-  iColumn = p->iCursorType;
+  iColumn = (p->iCursorType - QUERY_FULLTEXT);
   if( iColumn<0 || iColumn>=nColumn ){
     iFirst = 0;
     iLast = nColumn-1;
diff --git a/manifest b/manifest
index 5887d1e03c..a4af5ee9f8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sTCL\sbindings\sso\sthat\s@aaa\salways\streats\sthe\svariable\saaa\sas\na\sbytearray\sand\sbinds\sthe\svalue\sas\sa\sBLOB.\s\sThis\schange\sis\sbackwards\ncompatible\ssince\sthe\s$\sbehavior\sis\sunchanged\sand\s@\swas\snot\saccepted\nuntil\sthe\scurrent\sround\sof\schanges.\s(CVS\s4094)
-D 2007-06-19T23:01:42
+C Fix\ssnippet\sgeneration\swhen\sthe\sleft-most\scolumn\sof\san\sfts2\stable\sis\sused\sin\sthe\sMATCH\sclause.\sFix\sfor\sticket\s#2429.\s(CVS\s4095)
+D 2007-06-20T06:23:55
 F Makefile.in 5babd49c427a0e82e849c89a4d3c3c1e607ec014
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -36,7 +36,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 b058569b8bebd519b3bb43692240da1fef5246a8
+F ext/fts2/fts2.c 8f9bd5fce1a6900072ad9b65dd41fe8ba010f099
 F ext/fts2/fts2.h 591916a822cfb6426518fdbf6069359119bc46eb
 F ext/fts2/fts2_hash.c b3f22116d4ef0bc8f2da6e3fdc435c86d0951a9b
 F ext/fts2/fts2_hash.h e283308156018329f042816eb09334df714e105e
@@ -251,6 +251,7 @@ F test/fts2k.test 222d0b3bc8667753f18406aaea9906a6098ea016
 F test/fts2l.test 4c53c89ce3919003765ff4fd8d98ecf724d97dd3
 F test/fts2m.test 4b30142ead6f3ed076e880a2a464064c5ad58c51
 F test/fts2n.test a70357e72742681eaebfdbe9007b87ff3b771638
+F test/fts2o.test 05ce2ac9111c29998418a584de02136a0ded471b
 F test/func.test 605989453d1b42cec1d05c17aa232dc98e3e04e6
 F test/fuzz.test 62fc19dd36a427777fd671b569df07166548628a
 F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
@@ -507,7 +508,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P d88b79818a6a9e0413b9560687ec3c79fcb3dacc
-R d21ca8a6dbb4862f845d47de835dc249
-U drh
-Z 0aaea6ffbf1a789df99e683345d7d3e2
+P 6f7d55acedc92eeaf988425c719addd56209187f
+R daeedf3dc5f4a3b817306b9576386c25
+U danielk1977
+Z 92220c57e2724013f6febf5dcfc993d4
diff --git a/manifest.uuid b/manifest.uuid
index cc1d774756..c724094139 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f7d55acedc92eeaf988425c719addd56209187f
\ No newline at end of file
+fec56ad2ede53e3e202d9ad869a059eeb315796f
\ No newline at end of file
diff --git a/test/fts2o.test b/test/fts2o.test
new file mode 100644
index 0000000000..9af30ff6b4
--- /dev/null
+++ b/test/fts2o.test
@@ -0,0 +1,49 @@
+# 2007 June 20
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#*************************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this script is testing the FTS2 module.
+#
+# $Id: fts2o.test,v 1.1 2007/06/20 06:23:55 danielk1977 Exp $
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# If SQLITE_ENABLE_FTS2 is not defined, omit this file.
+ifcapable !fts2 {
+  finish_test
+  return
+}
+
+#---------------------------------------------------------------------
+# These tests, fts2o-1.*, test that ticket #2429 is fixed.
+#
+db eval {
+  CREATE VIRTUAL TABLE t1 USING fts2(a, b, c);
+  INSERT INTO t1(a, b, c) VALUES('one three four', 'one four', 'one four two');
+}
+do_test fts2o-1.1 {
+  execsql {
+    SELECT rowid, snippet(t1) FROM t1 WHERE c MATCH 'four';
+  }
+} {1 {one <b>four</b> two}}
+do_test fts2o-1.2 {
+  execsql {
+    SELECT rowid, snippet(t1) FROM t1 WHERE b MATCH 'four';
+  }
+} {1 {one <b>four</b>}}
+do_test fts2o-1.3 {
+  execsql {
+    SELECT rowid, snippet(t1) FROM t1 WHERE a MATCH 'four';
+  }
+} {1 {one three <b>four</b>}}
+
+finish_test