From: drh <>
Date: Fri, 4 Feb 2022 20:07:24 +0000 (+0000)
Subject: One more case of disabling errors for ALTER TABLE RENAME when
X-Git-Tag: version-3.38.0~55^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10d29c7a94f1634a7d8a95490340e863ad7220d6;p=thirdparty%2Fsqlite.git

One more case of disabling errors for ALTER TABLE RENAME when
writable_schema=ON.

FossilOrigin-Name: c52d0dd8f4f8fab4c3f33cbd26b4012569e76562282e85654018c836dca7b564
---

diff --git a/manifest b/manifest
index eff80ce005..5b12553cad 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sALTER\sTABLE\sRENAME\sCOLUMN\sto\sproceed\seven\sif\sthere\sare\serrors\sin\nthe\sschema,\sas\slong\sas\sPRAGMA\swritable_schema=ON\sis\sactive.
-D 2022-02-04T16:43:30.569
+C One\smore\scase\sof\sdisabling\serrors\sfor\sALTER\sTABLE\sRENAME\swhen\nwritable_schema=ON.
+D 2022-02-04T20:07:24.664
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 11c8e4d382632a024c19fa09131d271c8c36f5b520023066e08408973a20e82d
+F src/alter.c 1cf8dfe6d87b4af6e3c2113e08b483f2e92ea9303a70daf75ddc244be3aa7dd7
 F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
 F src/attach.c f26d400f3ffe2cdca01406bca70e5f58c5488bf165b4fc37c228136dfcf1b583
 F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
@@ -1943,11 +1943,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 70049342d5ad57ea3e863bba19253934b868bacdd1c26c9371bac024a829badf
-R ade5a35b1c4e6334138f31a1e28c7fb0
-T *branch * relaxed-alter-table
-T *sym-relaxed-alter-table *
-T -sym-trunk *
+P 197cbabf1767d0603928462fb75cf8100f6999f725e0db60d096c7ca20e3da28
+R 6e6953a314ca3fd9224d68be73afce7b
 U drh
-Z 7858525677fe7d863fef5513c510c7f5
+Z 4d8bc85d83a2c54196b606a1a5f7ecb7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dd1dfb7900..07f28dbf26 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-197cbabf1767d0603928462fb75cf8100f6999f725e0db60d096c7ca20e3da28
\ No newline at end of file
+c52d0dd8f4f8fab4c3f33cbd26b4012569e76562282e85654018c836dca7b564
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index 5cf28147c2..fa4fcb3c0d 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -1796,7 +1796,9 @@ static void renameTableFunc(
       rc = renameEditSql(context, &sCtx, zInput, zNew, bQuote);
     }
     if( rc!=SQLITE_OK ){
-      if( sParse.zErrMsg ){
+      if( sqlite3WritableSchema(db) ){
+        sqlite3_result_value(context, argv[3]);
+      }else if( sParse.zErrMsg ){
         renameColumnParseError(context, "", argv[1], argv[2], &sParse);
       }else{
         sqlite3_result_error_code(context, rc);