From 813342c4ab456efcf620993c074ecba6a72d2486 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 20 Jun 2013 19:55:50 +0000 Subject: [PATCH] Add tests for modifying the docid and languageid fields of an fts table with a non-zero languageid_bits field. FossilOrigin-Name: 949425d467947c3905cca3e08750fbaf2ef645db --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/fts4langid2.test | 13 +++++++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 8b0559280e..c492559602 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\ssome\sissues\srelated\sto\sORDER\sBY\sand\sfts\stables\swith\sa\snon-zero\slanguageid_bits\ssetting. -D 2013-06-20T18:32:34.406 +C Add\stests\sfor\smodifying\sthe\sdocid\sand\slanguageid\sfields\sof\san\sfts\stable\swith\sa\snon-zero\slanguageid_bits\sfield. +D 2013-06-20T19:55:50.400 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -546,7 +546,7 @@ F test/fts4aa.test 95f448fb02c4a976968b08d1b4ce134e720946ae F test/fts4check.test 66fa274cab2b615f2fb338b257713aba8fad88a8 F test/fts4content.test 6efc53b4fd03cab167e6998d2b0b7d4b7d419ee6 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7 -F test/fts4langid2.test a8f910bd50c78bfaa34cfb116aca78a6f872e047 +F test/fts4langid2.test 9d75a07687a058f8d0c4036289855ed019e3e128 F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891 F test/fts4merge3.test aab02a09f50fe6baaddc2e159c3eabc116d45fc7 @@ -1094,7 +1094,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 b1df00f3f1eecffbe6c56cdcbb922922314604a0 -R f595a064db43d7934ae58fdccae6729e +P 81527768ef9b39289cfda69d415069b7968379dd +R 048a66a227c9fbd0111b8d14b4bf151b U dan -Z fb6c5f5ef3c68a8dc49cef28913a67d5 +Z dc031be52762eed244125900c7455e59 diff --git a/manifest.uuid b/manifest.uuid index 047cfc949f..16ad1be0e3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -81527768ef9b39289cfda69d415069b7968379dd \ No newline at end of file +949425d467947c3905cca3e08750fbaf2ef645db \ No newline at end of file diff --git a/test/fts4langid2.test b/test/fts4langid2.test index 672b397bac..9f12af6174 100644 --- a/test/fts4langid2.test +++ b/test/fts4langid2.test @@ -314,14 +314,19 @@ do_execsql_test 8.1 { do_execsql_test 8.2 { SELECT docid FROM t1 ORDER BY docid; } {1 1 2 2 3 3} - -do_execsql_test 8.2 { +do_execsql_test 8.3 { SELECT docid FROM t1 WHERE t1 MATCH 'ghi' ORDER BY docid; } {2 3} - -do_execsql_test 8.2 { +do_execsql_test 8.4 { SELECT docid FROM t1 WHERE t1 MATCH 'ghi' ORDER BY docid DESC; } {3 2} +# Test that the docid and languageid fields may be updated. +# +do_execsql_test 8.5 { UPDATE t1 SET docid=docid+3, lid=0 WHERE lid=5; } +do_execsql_test 8.6 { SELECT docid FROM t1 ORDER BY docid; } {1 2 3 4 5 6} +do_execsql_test 8.7 { SELECT docid FROM t1 WHERE t1 MATCH 'A' } {4 6} +do_execsql_test 8.8 { SELECT docid FROM t1 WHERE t1 MATCH 'A' AND lid=5 } {} + finish_test -- 2.39.5