Add another test to verify that SQLite is using stat4 data for composite primary...

FossilOrigin-Name: 0df1fe72f8271abc86cd552027d938c910f90967

diff --git a/manifest b/manifest
index 4b1417a45488a9caf019d8368a6a2feb0064ff68..7a52f87c5e8ddad79e0327fd9bd8ac4a14b9f799 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sall\sfields\sare\sloaded\sfrom\sthe\sstat4\stable\sfor\srecords\sthat\scorrespond\sto\sindexes\son\sWITHOUT\sROWID\stables\swith\scomposite\sprimary\skeys.
-D 2014-07-01T11:54:02.938
+C Add\sanother\stest\sto\sverify\sthat\sSQLite\sis\susing\sstat4\sdata\sfor\scomposite\sprimary\skeys\son\sWITHOUT\sROWID\stables.
+D 2014-07-01T15:22:11.950
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1732320ecac3fee229d560d7ef2afa34681d1815
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -316,7 +316,7 @@ F test/analyze5.test 765c4e284aa69ca172772aa940946f55629bc8c4
 F test/analyze6.test d31defa011a561b938b4608d3538c1b4e0b5e92c
 F test/analyze7.test bb1409afc9e8629e414387ef048b8e0e3e0bdc4f
 F test/analyze8.test 093d15c1c888eed5034304a98c992f7360130b88
-F test/analyze9.test 3129cc8a82c3d6c5dfd340143b18499219faebac
+F test/analyze9.test bd5aaf2a8fd2dd774b08251416897185531a8adf
 F test/analyzeA.test 1a5c40079894847976d983ca39c707aaa44b6944
 F test/analyzeB.test 8bf35ee0a548aea831bf56762cb8e7fdb1db083d
 F test/async.test 1d0e056ba1bb9729283a0f22718d3a25e82c277b
@@ -1182,7 +1182,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f925e9baafea625f63105f8013abb3807b418379
-R b0479b264ee66056e956ca8c9e5bfcd6
+P 21981e35062cc6b30e9576786cbf55265a7a4d41
+R e4440e4e4a98b796b4fa8322644ff7eb
 U dan
-Z 2688039829f2bbaff9c051901e2506da
+Z 9cb18e75f66a8c4075f21fee1b6ab8d9

diff --git a/manifest.uuid b/manifest.uuid
index ec2c1a4071552fc79d35355b04b0565f5be72b1f..91d9eea5ecd5b49d81fa938938062d76a47fb631 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-21981e35062cc6b30e9576786cbf55265a7a4d41
\ No newline at end of file
+0df1fe72f8271abc86cd552027d938c910f90967
\ No newline at end of file

diff --git a/test/analyze9.test b/test/analyze9.test
index d8bdc768d34aae3f05025c0fc5f42daaa86504a9..fc5a13f43f879aaf4f84eb848854baf2bd9495f4 100644 (file)
--- a/test/analyze9.test
+++ b/test/analyze9.test
@@ -1055,7 +1055,6 @@ do_eqp_test 23.1 {
 } {
   0 0 0 {SEARCH TABLE t4 USING INDEX i41 (e=? AND c=? AND b=? AND a<?)}
 }
-
 do_eqp_test 23.2 {
   SELECT * FROM t4 WHERE 
     (e=1 AND b='xyz' AND c='zyx' AND a<'JJJ') AND f<300
@@ -1063,6 +1062,32 @@ do_eqp_test 23.2 {
   0 0 0 {SEARCH TABLE t4 USING INDEX i42 (f<?)}
 }
 
+do_execsql_test 24.0 {
+  CREATE TABLE t5(c, d, b, e, a, PRIMARY KEY(a, b, c)) WITHOUT ROWID;
+  WITH data(a, b, c, d, e) AS (
+    SELECT 'z', 'y', 0, 0, 0
+    UNION ALL
+    SELECT 
+      a, CASE WHEN b='y' THEN 'n' ELSE 'y' END, c+1, e/250, e+1 
+    FROM data
+    WHERE e<1000
+  )
+  INSERT INTO t5(a, b, c, d, e) SELECT * FROM data;
+  CREATE INDEX t5d ON t5(d);
+  CREATE INDEX t5e ON t5(e);
+  ANALYZE;
+}
+
+foreach {tn where eqp} {
+  1 "d=0 AND a='z' AND b='n' AND e<200" {/*t5d (d=? AND a=? AND b=?)*/}
+  2 "d=0 AND a='z' AND b='n' AND e<100" {/*t5e (e<?)*/}
+
+  3 "d=0 AND e<300"                     {/*t5d (d=?)*/}
+  4 "d=0 AND e<200"                     {/*t5e (e<?)*/}
+} {
+  do_eqp_test 24.$tn "SeLeCt * FROM t5 WHERE $where" $eqp
+}
+
 finish_test