aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordan <dan@noemail.net>2010-09-24 08:00:10 +0000
committerdan <dan@noemail.net>2010-09-24 08:00:10 +0000
commitcc9352e9f279017361f09a9be6c257cdca82258a (patch)
tree6c14cacb6df91fd52117c23340267c32fa9faed2
parentaf7626f5fbf0733f4481f67a8b8a664bc0899579 (diff)
downloadsqlite-cc9352e9f279017361f09a9be6c257cdca82258a.tar.gz
sqlite-cc9352e9f279017361f09a9be6c257cdca82258a.zip
Modify testable statement ids in a few test files to account for recent docsrc changes.
FossilOrigin-Name: 7893e525953da6c97eaea23fe94d26e1e635edea
-rw-r--r--manifest16
-rw-r--r--manifest.uuid2
-rw-r--r--test/e_delete.test7
-rw-r--r--test/e_select.test38
-rw-r--r--test/e_update.test13
5 files changed, 35 insertions, 41 deletions
diff --git a/manifest b/manifest
index f9b1c5c1c..490b12707 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sto\se_delete.test.
-D 2010-09-23T18:47:37
+C Modify\stestable\sstatement\sids\sin\sa\sfew\stest\sfiles\sto\saccount\sfor\srecent\sdocsrc\schanges.
+D 2010-09-24T08:00:11
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -348,13 +348,13 @@ F test/descidx2.test 9f1a0c83fd57f8667c82310ca21b30a350888b5d
F test/descidx3.test fe720e8b37d59f4cef808b0bf4e1b391c2e56b6f
F test/diskfull.test 0cede7ef9d8f415d9d3944005c76be7589bb5ebb
F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
-F test/e_delete.test d0c2be2fa1a7dd6648a4b5a2fdcbe4c802756728
+F test/e_delete.test 2081ad9be1de6b59efc256aebbf9e265e19cee61
F test/e_expr.test 164e87c1d7b40ceb47c57c3bffa384c81d009aa7
F test/e_fkey.test 6721a741c6499b3ab7e5385923233343c8f1ad05
F test/e_fts3.test 75bb0aee26384ef586165e21018a17f7cd843469
F test/e_insert.test d6af6e4a305afe1efbc8f0be7b68edc46abc17d8
-F test/e_select.test 64b9cc44f8df454f45bc8df032e12032c8bf8670
-F test/e_update.test 11c4192447db32e4ac6ee81d16eeb6525bc3a50a
+F test/e_select.test e9075e798a5f6d55f1dbacfe528f80b2d1a2750e
+F test/e_update.test 652708422ba034d6d5da2c4486a0b6e73e54be09
F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
@@ -863,7 +863,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7ff3574b9c581b5e1f2b6f98028106c638e59bb7
-R 1b59fd312b3a99059f83ad2bf3ea3829
+P fab3b383bb2c4764a56811f22ff4c783441918e8
+R 4683e99a104ba4aaae84fe720a6691d9
U dan
-Z 491ffce3dab8151bf3f81e7028f9463e
+Z 37fa86056d8a38c1bc8ef7e03a743aec
diff --git a/manifest.uuid b/manifest.uuid
index 285c54bdb..c1ec2a97f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fab3b383bb2c4764a56811f22ff4c783441918e8 \ No newline at end of file
+7893e525953da6c97eaea23fe94d26e1e635edea \ No newline at end of file
diff --git a/test/e_delete.test b/test/e_delete.test
index 18e4bcbe2..62b79915d 100644
--- a/test/e_delete.test
+++ b/test/e_delete.test
@@ -66,10 +66,9 @@ do_delete_tests e_delete-1.1 {
2 "DELETE FROM main.t2 ; SELECT * FROM t2" {}
}
-# EVIDENCE-OF: R-25092-63878 If a WHERE clause is supplied, then only
-# those rows for which evaluating the WHERE clause and casting the
-# result to a NUMERIC value produces a result other than NULL or zero
-# (integer value 0 or real value 0.0).
+# EVIDENCE-OF: R-30203-16177 If a WHERE clause is supplied, then only
+# those rows for which the result of evaluating the WHERE clause as a
+# boolean expression is true are deleted.
#
do_delete_tests e_delete-1.2 {
1 "DELETE FROM t3 WHERE 1 ; SELECT x FROM t3" {}
diff --git a/test/e_select.test b/test/e_select.test
index 973cf1279..c8baf1783 100644
--- a/test/e_select.test
+++ b/test/e_select.test
@@ -507,11 +507,10 @@ do_select_tests e_select-1.4.5 [list \
]
-# EVIDENCE-OF: R-45641-53865 If there is an ON clause specified, then
+# EVIDENCE-OF: R-22775-56496 If there is an ON clause specified, then
# the ON expression is evaluated for each row of the cartesian product
-# and the result cast to a numeric value as if by a CAST expression. All
-# rows for which the expression evaluates to NULL or zero (integer value
-# 0 or real value 0.0) are excluded from the dataset.
+# as a boolean expression. All rows for which the expression evaluates
+# to false are excluded from the dataset.
#
foreach {tn select res} [list \
1 { SELECT * FROM t1 %JOIN% t2 ON (1) } $t1_cross_t2 \
@@ -546,11 +545,10 @@ do_select_tests e_select-1.4 -error {
3 { SELECT * FROM t3, (SELECT a AS b, b AS c FROM t1) USING (a) } "a"
}
-# EVIDENCE-OF: R-42568-37000 For each pair of namesake columns, the
+# EVIDENCE-OF: R-55987-04584 For each pair of namesake columns, the
# expression "lhs.X = rhs.X" is evaluated for each row of the cartesian
-# product and the result cast to a numeric value. All rows for which one
-# or more of the expressions evaluates to NULL or zero are excluded from
-# the result set.
+# product as a boolean expression. All rows for which one or more of the
+# expressions evaluates to false are excluded from the result set.
#
do_select_tests e_select-1.5 {
1 { SELECT * FROM t1, t3 USING (a) } {a one 1 b two 2}
@@ -1060,11 +1058,10 @@ foreach {tn indexes} {
test_join $tn.1.11 "t2 CROSS JOIN t2 AS x" {t2 t2}
test_join $tn.1.12 "t2 JOIN t2 AS x" {t2 t2}
- # EVIDENCE-OF: R-45641-53865 If there is an ON clause specified, then
+ # EVIDENCE-OF: R-22775-56496 If there is an ON clause specified, then
# the ON expression is evaluated for each row of the cartesian product
- # and the result cast to a numeric value as if by a CAST expression. All
- # rows for which the expression evaluates to NULL or zero (integer value
- # 0 or real value 0.0) are excluded from the dataset.
+ # as a boolean expression. All rows for which the expression evaluates
+ # to false are excluded from the dataset.
#
test_join $tn.2.1 "t1, t2 ON (t1.a=t2.a)" {t1 t2 -on {te_equals a a}}
test_join $tn.2.2 "t2, t1 ON (t1.a=t2.a)" {t2 t1 -on {te_equals a a}}
@@ -1291,11 +1288,10 @@ do_execsql_test e_select-3.0 {
INSERT INTO x2 VALUES(7, 'mistrusted', 'standardized');
} {}
-# EVIDENCE-OF: R-22873-49686 If a WHERE clause is specified, the WHERE
-# expression is evaluated for each row in the input data and the result
-# cast to a numeric value. All rows for which the WHERE clause
-# expression evaluates to a NULL value or to zero (integer value 0 or
-# real value 0.0) are excluded from the dataset before continuing.
+# EVIDENCE-OF: R-06999-14330 If a WHERE clause is specified, the WHERE
+# expression is evaluated for each row in the input data as a boolean
+# expression. All rows for which the WHERE clause expression evaluates
+# to false are excluded from the dataset before continuing.
#
do_execsql_test e_select-3.1.1 { SELECT k FROM x1 WHERE x } {3}
do_execsql_test e_select-3.1.2 { SELECT k FROM x1 WHERE y } {3 5 6}
@@ -1627,10 +1623,10 @@ foreach {tn select} {
do_catchsql_test e_select-4.$tn $select $res
}
-# EVIDENCE-OF: R-40359-04817 If a HAVING clause is specified, it is
-# evaluated once for each group of rows and cast to an integer value. If
-# the result of evaluating the HAVING clause is NULL or zero (integer
-# value 0), the group is discarded.
+# EVIDENCE-OF: R-31537-00101 If a HAVING clause is specified, it is
+# evaluated once for each group of rows as a boolean expression. If the
+# result of evaluating the HAVING clause is false, the group is
+# discarded.
#
# This requirement is tested by all e_select-4.13.* tests.
#
diff --git a/test/e_update.test b/test/e_update.test
index 185df0bae..12db15b81 100644
--- a/test/e_update.test
+++ b/test/e_update.test
@@ -146,10 +146,9 @@ do_update_tests e_update-1.2 {
{greek roman greek roman greek roman}
}
-# EVIDENCE-OF: R-41754-00978 Otherwise, the UPDATE affects only those
-# rows for which evaluating the WHERE clause expression and casting the
-# result to a NUMERIC value produces a value other than NULL or zero
-# (integer value 0 or real value 0.0).
+# EVIDENCE-OF: R-42117-40023 Otherwise, the UPDATE affects only those
+# rows for which the result of evaluating the WHERE clause expression as
+# a boolean expression is true.
#
do_execsql_test e_update-1.3.0 {
DELETE FROM main.t1;
@@ -172,9 +171,9 @@ do_update_tests e_update-1.3 {
{{} lithuanian 1 macedonian 2 macedonian 3 macedonian}
}
-# EVIDENCE-OF: R-61178-36001 It is not an error if the WHERE clause does
-# not evaluate to a non-NULL, non-zero value for any row in the table -
-# this just means that the UPDATE statement affects zero rows.
+# EVIDENCE-OF: R-58129-20729 It is not an error if the WHERE clause does
+# not evaluate to true for any row in the table - this just means that
+# the UPDATE statement affects zero rows.
#
do_execsql_test e_update-1.4.0 {
DELETE FROM main.t1;