From: drh <>
Date: Sun, 6 Feb 2022 21:13:59 +0000 (+0000)
Subject: With the new ALTER TABLE under PRAGMA writable_schema=ON processing, do not
X-Git-Tag: version-3.38.0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89e9baa2ca81d181442762499fd730b320063937;p=thirdparty%2Fsqlite.git

With the new ALTER TABLE under PRAGMA writable_schema=ON processing, do not
ignore non-parser errors such as OOMs.

FossilOrigin-Name: 36653ccef68cf61b6001000a713b06e951cb6fddced6b6a906c3b17d70a8af87
---

diff --git a/manifest b/manifest
index ce8fcb65ca..8e9a9edd5b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Faster\scomputation\sof\sExpr.nHeight.
-D 2022-02-06T11:51:23.635
+C With\sthe\snew\sALTER\sTABLE\sunder\sPRAGMA\swritable_schema=ON\sprocessing,\sdo\snot\nignore\snon-parser\serrors\ssuch\sas\sOOMs.
+D 2022-02-06T21:13:59.488
 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 af5606a4d7f35a13ce577d96f222d5e6a3c0c23de5b903dd53f28f5a4f57a064
+F src/alter.c b62636548008957337b73ff9f1f5294ca9793e5b01e986ecb56cfafd58ba78f2
 F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
 F src/attach.c f26d400f3ffe2cdca01406bca70e5f58c5488bf165b4fc37c228136dfcf1b583
 F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
@@ -1943,8 +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 38e057a580613be176552e230e40b4434a9ed57a82d407e92a23c7b8e62c0b0e
-R 17ee54b746725bb2605da7bcf56f32eb
+P a7a5af327ba8bafcd58b828e3e7a10d0008bb780d55a6c573aa15896dcc8ab89
+R 9e12eaf92c400a1abbda125c72539642
 U drh
-Z 610e035a1e7d6996a44dc02d2b1f002f
+Z 5efe5ab9e96534fa8b62087cb17d4d0d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a3dab576b9..8341445ecf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7a5af327ba8bafcd58b828e3e7a10d0008bb780d55a6c573aa15896dcc8ab89
\ No newline at end of file
+36653ccef68cf61b6001000a713b06e951cb6fddced6b6a906c3b17d70a8af87
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index dfffcc9b80..20827deacf 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -1061,12 +1061,12 @@ static void renameColumnParseError(
   const char *zN = (const char*)sqlite3_value_text(pObject);
   char *zErr;
 
-  zErr = sqlite3_mprintf("error in %s %s%s%s: %s", 
+  zErr = sqlite3MPrintf(pParse->db, "error in %s %s%s%s: %s", 
       zT, zN, (zWhen[0] ? " " : ""), zWhen,
       pParse->zErrMsg
   );
   sqlite3_result_error(pCtx, zErr, -1);
-  sqlite3_free(zErr);
+  sqlite3DbFree(pParse->db, zErr);
 }
 
 /*
@@ -1595,7 +1595,7 @@ static void renameColumnFunc(
 
 renameColumnFunc_done:
   if( rc!=SQLITE_OK ){
-    if( sqlite3WritableSchema(db) ){
+    if( rc==SQLITE_ERROR && sqlite3WritableSchema(db) ){
       sqlite3_result_value(context, argv[0]);
     }else if( sParse.zErrMsg ){
       renameColumnParseError(context, "", argv[1], argv[2], &sParse);
@@ -1796,7 +1796,7 @@ static void renameTableFunc(
       rc = renameEditSql(context, &sCtx, zInput, zNew, bQuote);
     }
     if( rc!=SQLITE_OK ){
-      if( sqlite3WritableSchema(db) ){
+      if( rc==SQLITE_ERROR && sqlite3WritableSchema(db) ){
         sqlite3_result_value(context, argv[3]);
       }else if( sParse.zErrMsg ){
         renameColumnParseError(context, "", argv[1], argv[2], &sParse);
@@ -1923,7 +1923,7 @@ static void renameQuotefixFunc(
       renameTokenFree(db, sCtx.pList);
     }
     if( rc!=SQLITE_OK ){
-      if( sqlite3WritableSchema(db) ){
+      if( sqlite3WritableSchema(db) && rc==SQLITE_ERROR ){
         sqlite3_result_value(context, argv[1]);
       }else{
         sqlite3_result_error_code(context, rc);