Mark the table-named column HIDDEN. Add tests to make sure it's

working as expected. (CVS 4425)

FossilOrigin-Name: ca669eaf1b4af441741129bee4af02f32a7c74b8

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 7a808273c211660bb915f5993f9812c280d47d15..af3a557945786418c7940f03b7d81fb0319ae6b6 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -2702,7 +2702,7 @@ static char *fulltextSchema(
     zSchema = zNext;
     zSep = ",";
   }
-  zNext = sqlite3_mprintf("%s,%Q)", zSchema, zTableName);
+  zNext = sqlite3_mprintf("%s,%Q HIDDEN)", zSchema, zTableName);
   sqlite3_free(zSchema);
   return zNext;
 }

diff --git a/manifest b/manifest
index ad04de59a7205201db961ca8aeb5bcd29fdc25a8..9d7f544bd42c238ae268114a2b3322781987e2d2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sincorrect\sindex\scost\sassumptions\sthat\soccur\safter\san\sANALYZE.\nTicket\s#2643.\s(CVS\s4424)
-D 2007-09-13T17:54:40
+C Mark\sthe\stable-named\scolumn\sHIDDEN.\s\sAdd\stests\sto\smake\ssure\sit's\nworking\sas\sexpected.\s(CVS\s4425)
+D 2007-09-13T18:12:10
 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -49,7 +49,7 @@ F ext/fts2/fts2_tokenizer1.c 8a545c232bdffafd117c4eeaf59789691909f26a
 F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.tokenizers a97c9a55b3422f6cb04af9de9296fe2447ea4a78
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c f85d5d8fdf0c691d5d542917dffcdd8f6f570ed1
+F ext/fts3/fts3.c fa62f3981802f260bd2131f7aabb532e7957b537
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3_hash.c 84654768178452b00bbc986dd878a8299dc1e3dc
 F ext/fts3/fts3_hash.h af585d6867d478fc0457f64cfaae60e09541e63a
@@ -304,7 +304,7 @@ F test/fts3am.test 218aa6ba0dfc50c7c16b2022aac5c6be593d08d8
 F test/fts3an.test 2da4df52fe8ea8389f6fa7a01e4c1a0f091118d6
 F test/fts3ao.test 0aa29dd4fc1c8d46b1f7cfe5926f7ac97551bea9
 F test/fts3atoken.test 25c2070e1e8755d414bf9c8200427b277a9f99fa
-F test/fts3b.test 94cd8a2fb709c99c1617df01f6908de77892d8bc
+F test/fts3b.test 7c697946fe11b651c4531c522519f8c50bc333ec
 F test/func.test 590fe3e1d28256d98dd73efb671de0823043e82a
 F test/fuzz.test 62fc19dd36a427777fd671b569df07166548628a
 F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
@@ -577,7 +577,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P c8405b15c074c94dab5e33272cf1471f458d11df
-R b946fdafcbe6e914052dcda867e14d99
-U drh
-Z c838890951ff9cb355602e662e43675b
+P 2cfdbfe6543bac42961deecec7d085d806e604b5
+R f4605f4a6437f7ace832bd72a3a46cf2
+U shess
+Z 8703f97ca6b737d36a523e680d867934

diff --git a/manifest.uuid b/manifest.uuid
index 6a2f7a6c3473bdf9bdba5d8e86442279c8d1d924..476aaced2141b3435c259a02676a46ed25531104 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2cfdbfe6543bac42961deecec7d085d806e604b5
\ No newline at end of file
+ca669eaf1b4af441741129bee4af02f32a7c74b8
\ No newline at end of file

diff --git a/test/fts3b.test b/test/fts3b.test
index 9f1c18e4a373a361d19dae7a4926550edeeee6a4..770e97cd9d142c1f4057f61ed0432a3b749331cc 100644 (file)
--- a/test/fts3b.test
+++ b/test/fts3b.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  This
 # script tests for the fts2 rowid-versus-vacuum problem (ticket #2566).
 #
-# $Id: fts3b.test,v 1.1 2007/08/23 20:23:37 shess Exp $
+# $Id: fts3b.test,v 1.2 2007/09/13 18:12:10 shess Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -103,4 +103,37 @@ do_test fts3b-2.2 {
   }
 } $res
 
+# Since fts3 is already an API break, I've marked the table-named
+# column HIDDEN.
+
+db eval {
+  CREATE VIRTUAL TABLE t3 USING fts3(c);
+  INSERT INTO t3 (c) VALUES('this is a test');
+  INSERT INTO t3 (c) VALUES('that was a test');
+  INSERT INTO t3 (c) VALUES('this is fun');
+  DELETE FROM t3 WHERE c = 'that was a test';
+}
+
+# Test that the table-named column still works.
+do_test fts3b-3.1 {
+  execsql {
+    SELECT snippet(t3) FROM t3 WHERE t3 MATCH 'test';
+  }
+} {{this is a <b>test</b>}}
+
+# Test that the column doesn't appear when selecting all columns.
+do_test fts3b-3.2 {
+  execsql {
+    SELECT * FROM t3 WHERE rowid = 1;
+  }
+} {{this is a test}}
+
+# Test that the column doesn't conflict with inserts that don't name
+# columns.
+do_test fts3b-3.3 {
+  execsql {
+    INSERT INTO t3 VALUES ('another test');
+  }
+} {}
+
 finish_test