From: dan <dan@noemail.net>
Date: Wed, 9 Jan 2013 15:44:23 +0000 (+0000)
Subject: Check in an extra test for the fts4 "content=" option. No code changes.
X-Git-Tag: version-3.7.16~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fe27de6514a3e217a4b82c92b3a7f07b5e921a1;p=thirdparty%2Fsqlite.git

Check in an extra test for the fts4 "content=" option. No code changes.

FossilOrigin-Name: 0d0e5ab8f16c890629ec1120c78168ef6be9e419
---

diff --git a/manifest b/manifest
index d43d6d923f..10fec36728 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sover-aggressive\soptimization\sof\sORDER\sBY\son\sa\sthree-way\sjoin\swhere\sthe\nsecond\stable\sis\sUNIQUE\sand\sthe\sORDER\sBY\soccurs\son\sthe\sthird\stable.\nTicket\s[598f5f7596b0557].
-D 2013-01-09T11:31:17.442
+C Check\sin\san\sextra\stest\sfor\sthe\sfts4\s"content="\soption.\sNo\scode\schanges.
+D 2013-01-09T15:44:23.023
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -500,7 +500,7 @@ F test/fts3snippet.test 8e956051221a34c7daeb504f023cb54d5fa5a8b2
 F test/fts3sort.test 95be0b19d7e41c44b29014f13ea8bddd495fd659
 F test/fts4aa.test 95f448fb02c4a976968b08d1b4ce134e720946ae
 F test/fts4check.test 66fa274cab2b615f2fb338b257713aba8fad88a8
-F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
+F test/fts4content.test b8032a15a6cd91df41cf6f335167e02b4a037ed5
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
 F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
 F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
@@ -1032,7 +1032,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 7249bfc2ca57624d73f2be0197a9807c58463c48
-R fcfe7ea587f64ef92e6849f97c544ccd
-U drh
-Z 6e8a59f9682c67ec0cee9fce08b8ae23
+P 5774f2175ce621dfc4b6b93f7ee13fd66f3ec2b9
+R 55e61a393f7fda758ca2247ac64f35c5
+U dan
+Z 742a4d1e5d57ee15d6514285ba4dd6df
diff --git a/manifest.uuid b/manifest.uuid
index 104853bdda..562f951683 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5774f2175ce621dfc4b6b93f7ee13fd66f3ec2b9
\ No newline at end of file
+0d0e5ab8f16c890629ec1120c78168ef6be9e419
\ No newline at end of file
diff --git a/test/fts4content.test b/test/fts4content.test
index 59c4199fa2..1b25e0818f 100644
--- a/test/fts4content.test
+++ b/test/fts4content.test
@@ -46,6 +46,8 @@ ifcapable !fts3 {
 #   8.* - Test that if the content=xxx and prefix options are used together,
 #         the 'rebuild' command still works.
 #
+#   9.* - Test using content=xxx where xxx is a virtual table.
+#
 
 do_execsql_test 1.1.1 {
   CREATE TABLE t1(a, b, c);
@@ -522,4 +524,42 @@ do_execsql_test 8.4 { SELECT rowid FROM ft10 WHERE a MATCH 'ab*';      } {1 2 3}
 do_execsql_test 8.5 { SELECT rowid FROM ft10 WHERE b MATCH 'abav*';    } {3}
 do_execsql_test 8.6 { SELECT rowid FROM ft10 WHERE ft10 MATCH 'abas*'; } {1}
 
+#-------------------------------------------------------------------------
+# Test cases 9.*
+# 
+reset_db
+register_echo_module [sqlite3_connection_pointer db]
+
+do_execsql_test 9.1 {
+  CREATE TABLE tbl1(a, b);
+  INSERT INTO tbl1 VALUES('a b', 'c d');
+  INSERT INTO tbl1 VALUES('e f', 'a b');
+  CREATE VIRTUAL TABLE e1 USING echo(tbl1);
+  CREATE VIRTUAL TABLE ft1 USING fts4(content=e1);
+  INSERT INTO ft1(ft1) VALUES('rebuild');
+}
+
+do_execsql_test 9.2 {
+  SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'e'
+} {2 {e f} {a b}}
+
+do_execsql_test 9.3 {
+  SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'a'
+} {1 {a b} {c d} 2 {e f} {a b}}
+
+do_execsql_test 9.4 { 
+  DELETE FROM ft1 WHERE docid=1;
+}
+
+do_execsql_test 9.5 {
+  SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'a'
+} {2 {e f} {a b}}
+
+do_execsql_test 9.6 {
+  INSERT INTO ft1(ft1) VALUES('rebuild');
+  SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'a'
+} {1 {a b} {c d} 2 {e f} {a b}}
+
+
+
 finish_test