Fix problem with test names in e_select.test.

FossilOrigin-Name: 8fe34faf6b8ddbb8ddd23418163650e846104328

diff --git a/manifest b/manifest
index 940c0514fd4056d71d3c52004b46539b4e178050..68c1557153c5d7e8625a7d464b37d99782d538b8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sto\se_select.test.
-D 2010-09-08T19:02:32
+C Fix\sproblem\swith\stest\snames\sin\se_select.test.
+D 2010-09-08T19:16:49
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -350,7 +350,7 @@ F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
 F test/e_expr.test 164e87c1d7b40ceb47c57c3bffa384c81d009aa7
 F test/e_fkey.test 6721a741c6499b3ab7e5385923233343c8f1ad05
 F test/e_fts3.test 75bb0aee26384ef586165e21018a17f7cd843469
-F test/e_select.test f84259a15040cd0301e66d1d28b45558e8ab4bcb
+F test/e_select.test 59c4dd36b2cb22f1c9fcda9e6b3e02aaa2b07d0b
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
@@ -857,7 +857,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P a932fab299b3c32dea4d08729e9fab3735631e88
-R 87c95140254fb879dafe5e5397901db5
+P 727ced6babf8aca87a69632949a7a0ce9bc2be89
+R 43c601d10fdda05cfc79f09f9a1b17a8
 U dan
-Z beab32c26af0239f0a5a2a6050d6f3c3
+Z 45c98c48ac5be1716fdcb5e5aefa5d66

diff --git a/manifest.uuid b/manifest.uuid
index 7a076e313485ce6eb9e5ff92ae2e6325b6a3fb7a..0e74cb2fc381a927299412d33ff32a419d24c110 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-727ced6babf8aca87a69632949a7a0ce9bc2be89
\ No newline at end of file
+8fe34faf6b8ddbb8ddd23418163650e846104328
\ No newline at end of file

diff --git a/test/e_select.test b/test/e_select.test
index 7709c97533dde4d3b1f4ee9edeb8bc80d5857dc3..493e5779d5c4c8609c81ad32e836f35fe8bbb93b 100644 (file)
--- a/test/e_select.test
+++ b/test/e_select.test
@@ -851,75 +851,75 @@ foreach {tn indexes} {
   test_join $tn.2.6  "t1, t2 ON (1.1-1.0)"    {t1 t2 -on te_true}
 
 
-  test_join 3 "t1 LEFT JOIN t2 ON (t1.a=t2.a)" {t1 t2 -left -on {te_equals a a}}
-  test_join 4 "t1 LEFT JOIN t2 USING (a)" {
+  test_join $tn.3 "t1 LEFT JOIN t2 ON (t1.a=t2.a)" {t1 t2 -left -on {te_equals a a}}
+  test_join $tn.4 "t1 LEFT JOIN t2 USING (a)" {
     t1 t2 -left -using a -on {te_equals a a}
   }
-  test_join 5 "t1 CROSS JOIN t2 USING(b, a)" {
+  test_join $tn.5 "t1 CROSS JOIN t2 USING(b, a)" {
     t1 t2 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 6 "t1 NATURAL JOIN t2" {
+  test_join $tn.6 "t1 NATURAL JOIN t2" {
     t1 t2 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 7 "t1 NATURAL INNER JOIN t2" {
+  test_join $tn.7 "t1 NATURAL INNER JOIN t2" {
     t1 t2 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 8 "t1 NATURAL CROSS JOIN t2" {
+  test_join $tn.8 "t1 NATURAL CROSS JOIN t2" {
     t1 t2 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 9 "t1 NATURAL INNER JOIN t2" {
+  test_join $tn.9 "t1 NATURAL INNER JOIN t2" {
     t1 t2 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 10 "t1 NATURAL LEFT JOIN t2" {
+  test_join $tn.10 "t1 NATURAL LEFT JOIN t2" {
     t1 t2 -left -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 11 "t1 NATURAL LEFT OUTER JOIN t2" {
+  test_join $tn.11 "t1 NATURAL LEFT OUTER JOIN t2" {
     t1 t2 -left -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 12 "t2 NATURAL JOIN t1" {
+  test_join $tn.12 "t2 NATURAL JOIN t1" {
     t2 t1 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 13 "t2 NATURAL INNER JOIN t1" {
+  test_join $tn.13 "t2 NATURAL INNER JOIN t1" {
     t2 t1 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 14 "t2 NATURAL CROSS JOIN t1" {
+  test_join $tn.14 "t2 NATURAL CROSS JOIN t1" {
     t2 t1 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 15 "t2 NATURAL INNER JOIN t1" {
+  test_join $tn.15 "t2 NATURAL INNER JOIN t1" {
     t2 t1 -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 16 "t2 NATURAL LEFT JOIN t1" {
+  test_join $tn.16 "t2 NATURAL LEFT JOIN t1" {
     t2 t1 -left -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 17 "t2 NATURAL LEFT OUTER JOIN t1" {
+  test_join $tn.17 "t2 NATURAL LEFT OUTER JOIN t1" {
     t2 t1 -left -using {a b} -on {te_and {te_equals a a} {te_equals b b}}
   }
-  test_join 18 "t1 LEFT JOIN t2 USING (b)" {
+  test_join $tn.18 "t1 LEFT JOIN t2 USING (b)" {
     t1 t2 -left -using b -on {te_equals b b}
   }
-  test_join 19 "t1 JOIN t3 USING(b)" {t1 t3 -using b -on {te_equals b b}}
-  test_join 20 "t3 JOIN t1 USING(b)" {
+  test_join $tn.19 "t1 JOIN t3 USING(b)" {t1 t3 -using b -on {te_equals b b}}
+  test_join $tn.20 "t3 JOIN t1 USING(b)" {
     t3 t1 -using b -on {te_equals -nocase b b}
   }
-  test_join 21 "t1 NATURAL JOIN t3"  {
+  test_join $tn.21 "t1 NATURAL JOIN t3"  {
     t1 t3 -using b -on {te_equals b b}
   }
-  test_join 22 "t3 NATURAL JOIN t1"  {
+  test_join $tn.22 "t3 NATURAL JOIN t1"  {
     t3 t1 -using b -on {te_equals -nocase b b}
   }
-  test_join 23 "t1 NATURAL LEFT JOIN t3" {
+  test_join $tn.23 "t1 NATURAL LEFT JOIN t3" {
     t1 t3 -left -using b -on {te_equals b b}
   }
-  test_join 24 "t3 NATURAL LEFT JOIN t1" {
+  test_join $tn.24 "t3 NATURAL LEFT JOIN t1" {
     t3 t1 -left -using b -on {te_equals -nocase b b}
   }
-  test_join 25 "t1 LEFT JOIN t3 ON (t3.b=t1.b)" {
+  test_join $tn.25 "t1 LEFT JOIN t3 ON (t3.b=t1.b)" {
     t1 t3 -left -on {te_equals -nocase b b}
   }
-  test_join 26 "t1 LEFT JOIN t3 ON (t1.b=t3.b)" {
+  test_join $tn.26 "t1 LEFT JOIN t3 ON (t1.b=t3.b)" {
     t1 t3 -left -on {te_equals b b}
   }
-  test_join 27 "t1 JOIN t3 ON (t1.b=t3.b)" { t1 t3 -on {te_equals b b} }
+  test_join $tn.27 "t1 JOIN t3 ON (t1.b=t3.b)" { t1 t3 -on {te_equals b b} }
 
   # EVIDENCE-OF: R-28760-53843 When more than two tables are joined
   # together as part of a FROM clause, the join operations are processed
@@ -970,7 +970,7 @@ foreach {tn indexes} {
 # if it was a table containing the data returned by executing the
 # sub-select statement.
 #
-proc test_subselect_join {tn subselect select script} {
+foreach {tn subselect select script} {
   1   "SELECT * FROM t2"   "SELECT * FROM t1 JOIN (%ss%)" 
     {t1 %ss%}
 } {