From 0ca23aa4370dc0e2bfb9e0e737cea5eef44e10db Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 12 Mar 2021 13:49:09 +0000
Subject: [PATCH] Fix broken requirement marks.

FossilOrigin-Name: 98d67152849e062c6de45b0e526daffc3d6cb29d563d40664a8d7140119a30b2
---
 manifest                | 16 ++++++++--------
 manifest.uuid           |  2 +-
 test/alterdropcol2.test | 18 +++++++++++++-----
 test/e_fkey.test        |  4 ++--
 test/indexedby.test     |  6 +++---
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/manifest b/manifest
index e3fb998af7..aaaa164d0d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\s".read"\scommand\sin\sthe\sCLI\sso\sthat\sSQLITE_OMIT_POPEN\sdisables\nreading\sfrom\sa\spipeline.
-D 2021-03-12T01:49:08.236
+C Fix\sbroken\srequirement\smarks.
+D 2021-03-12T13:49:09.045
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -650,7 +650,7 @@ F test/alterauth2.test 794ac5cef251819fe364b4fe20f12f86e9c5d68070513c7fd26c17cb2
 F test/altercol.test 65eef562f0eea7a1f5ddd4a140c4274c2bfc5712bb2ab2096f738852b0efce86
 F test/altercorrupt.test 584d707a80e106952d6382790c8919bcf9f0db678ed3a1c09fd98b7f9d1d3a10
 F test/alterdropcol.test 596623cb8a72d9570bfb8417b0f302810efe007873796f03c17a9e9ff28dade1
-F test/alterdropcol2.test 3948c805ca52f4621051b35968c18c09d107eb117e2b656c78cee3b2870650c0
+F test/alterdropcol2.test 527fce683b200d620f560f666c44ae33e22728e990a10a48a543280dfd4b4d41
 F test/alterlegacy.test f38c6d06cda39e1f7b955bbce57f2e3ef5b7cb566d3d1234502093e228c15811
 F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74a3fb80c9
 F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
@@ -855,7 +855,7 @@ F test/e_delete.test ab39084f26ae1f033c940b70ebdbbd523dc4962e
 F test/e_droptrigger.test 235c610f8bf8ec44513e222b9085c7e49fad65ad0c1975ac2577109dd06fd8fa
 F test/e_dropview.test 74e405df7fa0f762e0c9445b166fe03955856532e2bb234c372f7c51228d75e7
 F test/e_expr.test 6ba7a51ece7b3e7fc145f14f924eed25ebb5a24e7b8596c78f3838d372cf0385
-F test/e_fkey.test 0b458b85f192cdb9e9933d5891848bb19bcc44d3f49faf111a375f2844a164d3
+F test/e_fkey.test a2907f749cccd0b2c30d8576b673002eebdcc1fc9964bae61e5117b1d54733e2
 F test/e_fts3.test 17ba7c373aba4d4f5696ba147ee23fd1a1ef70782af050e03e262ca187c5ee07
 F test/e_insert.test f02f7f17852b2163732c6611d193f84fc67bc641fb4882c77a464076e5eba80e
 F test/e_reindex.test 2b0e29344497d9a8a999453a003cb476b6b1d2eef2d6c120f83c2d3a429f3164
@@ -1094,7 +1094,7 @@ F test/index6.test f172653b35b20233e59200e8b92a76db61bf7285437bf777b93b306ba26a4
 F test/index7.test b8a0ba2110fd517bb48c4e76d26d60f1ab2ed9e257b18d71f820d7e71e9f8570
 F test/index8.test bc2e3db70e8e62459aaa1bd7e4a9b39664f8f9d7
 F test/index9.test 0aa3e509dddf81f93380396e40e9bb386904c1054924ba8fa9bcdfe85a8e7721
-F test/indexedby.test f54aac21c06948872010a956fd02de5178c362c7785a9887cf0b8616be17883b
+F test/indexedby.test a3ca11f0819a9279619099f36b624bcaa315f7a1ed65c3ed2219c2a944683d2c
 F test/indexexpr1.test 284e119999d132cc8bf37735a928c9859b28e8e295d02b7a6a4f93977c7f9ba5
 F test/indexexpr2.test dba11dbb0a58fcba4cd694f46b4004976123b81b0501f525d43c9be59f0207b1
 F test/indexfault.test 98d78a8ff1f5335628b62f886a1cb7c7dac1ef6d48fa39c51ec871c87dce9811
@@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9d6e544c47b9a5d97bd02a658db5cd202bd1952f8ba3bc50e8cf47d7206041c0
-R 8423c0661daaf9ba8568de41b16ee2d0
+P cea34f3cc35ad6dc67691799a219a30739f2296945d624d232bf76150c598ec0
+R 39a4a0d8e5c6bc44cb1af4a996c13e18
 U drh
-Z 4bad0f2be62fa6cc0585721a6a18ada9
+Z 8f7df79a9e91c5a073fb0cc514d572c7
diff --git a/manifest.uuid b/manifest.uuid
index 231783496a..6ed1e5c06b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cea34f3cc35ad6dc67691799a219a30739f2296945d624d232bf76150c598ec0
\ No newline at end of file
+98d67152849e062c6de45b0e526daffc3d6cb29d563d40664a8d7140119a30b2
\ No newline at end of file
diff --git a/test/alterdropcol2.test b/test/alterdropcol2.test
index 8af3677d32..d60e7db441 100644
--- a/test/alterdropcol2.test
+++ b/test/alterdropcol2.test
@@ -57,7 +57,7 @@ proc do_atdc_error_test {tn schema atdc error} {
 # and does not have a UNIQUE constraint.
 #
 
-# EVIDENCE-OF: R-05184-13006 The column is a PRIMARY KEY.
+# EVIDENCE-OF: R-52436-31752 The column is a PRIMARY KEY or part of one.
 #
 do_atdc_error_test 2.1.1 {
   CREATE TABLE x1(a PRIMARY KEY, b, c);
@@ -66,6 +66,13 @@ do_atdc_error_test 2.1.1 {
 } {
   cannot drop PRIMARY KEY column: "a"
 }
+do_atdc_error_test 2.1.2 {
+  CREATE TABLE x1(a,b,c,d,e, PRIMARY KEY(b,c,d));
+} { 
+  ALTER TABLE x1 DROP COLUMN c
+} {
+  cannot drop PRIMARY KEY column: "c"
+}
 
 # EVIDENCE-OF: R-43412-16016 The column has a UNIQUE constraint.
 #
@@ -84,7 +91,7 @@ do_atdc_error_test 2.2.2 {
   error in table x1 after drop column: no such column: c
 }
 
-# EVIDENCE-OF: R-46731-08965: The column is indexed.
+# EVIDENCE-OF: R-46731-08965 The column is indexed.
 #
 do_atdc_error_test 2.3.1 {
   CREATE TABLE 'one two'('x y', 'z 1', 'a b');
@@ -103,7 +110,7 @@ do_atdc_error_test 2.3.2 {
   error in index idx after drop column: no such column: a
 }
 
-# EVIDENCE-OF: R-46731-08965: The column is indexed.
+# EVIDENCE-OF: R-46731-08965 The column is indexed.
 #
 do_atdc_error_test 2.4.1 {
   CREATE TABLE x1234(a, b, c PRIMARY KEY) WITHOUT ROWID;
@@ -114,7 +121,8 @@ do_atdc_error_test 2.4.1 {
   error in index i1 after drop column: no such column: a
 }
 
-# EVIDENCE-OF: R-18825-17786 The column appears in a table CHECK constraint.
+# EVIDENCE-OF: R-47838-03249 The column is named in a table or column
+# CHECK constraint not associated with the column being dropped.
 #
 do_atdc_error_test 2.5.1 {
   CREATE TABLE x1234(a, b, c PRIMARY KEY, CHECK(((a+5)%10)!=0)) WITHOUT ROWID;
@@ -187,7 +195,7 @@ do_atdc_error_test 2.8.3 {
 # if the CHECK constraint was specified as part of the column definition.
 #
 
-# EVIDENCE-OF: R-60924-11170 However, the column being deleted can be used in a
+# STALE-EVIDENCE: R-60924-11170 However, the column being deleted can be used in a
 # column CHECK constraint because the column CHECK constraint is dropped
 # together with the column itself.
 do_execsql_test 3.0 {
diff --git a/test/e_fkey.test b/test/e_fkey.test
index c5ac5fde38..40fa075df3 100644
--- a/test/e_fkey.test
+++ b/test/e_fkey.test
@@ -2055,9 +2055,9 @@ do_test e_fkey-44.5 {
 #-------------------------------------------------------------------------
 # Test SET DEFAULT actions.
 #
-# EVIDENCE-OF: R-43054-54832 The "SET DEFAULT" actions are similar to
+# EVIDENCE-OF: R-55814-22637 The "SET DEFAULT" actions are similar to
 # "SET NULL", except that each of the child key columns is set to
-# contain the columns default value instead of NULL.
+# contain the column's default value instead of NULL.
 #
 drop_all_tables
 do_test e_fkey-45.1 {
diff --git a/test/indexedby.test b/test/indexedby.test
index 18f7bb8fa3..41a52d8224 100644
--- a/test/indexedby.test
+++ b/test/indexedby.test
@@ -90,9 +90,9 @@ do_test indexedby-2.4 {
   catchsql { SELECT * FROM t1 INDEXED BY i3 WHERE a = 'one' AND b = 'two'}
 } {1 {no such index: i3}}
 
-# EVIDENCE-OF: R-62112-42456 If the query optimizer is unable to use the
-# index specified by the INDEX BY clause, then the query will fail with
-# an error.
+# EVIDENCE-OF: R-05301-32681 If the query optimizer is unable to use the
+# index specified by the INDEXED BY clause, then the query will fail
+# with an error.
 do_test indexedby-2.4.1 {
   catchsql { SELECT b FROM t1 INDEXED BY i1 WHERE b = 'two' }
 } {0 {}}