From 678f3b33cc057f8253444343575d24ab093d8ddf Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 18 Feb 2021 20:27:46 +0000
Subject: [PATCH] Fix DROP COLUMN so that it works even if the user has
 registered an authorizer callback.

FossilOrigin-Name: e5f144182bbb3ba10c77151cf63c8bddf86374049fb6866387f85e335df298cb
---
 manifest             | 14 +++++++-------
 manifest.uuid        |  2 +-
 src/alter.c          |  9 ++++++++-
 test/alterauth2.test | 17 +++++++++++++++++
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index bc2e3dbf4b..d852fefe4b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sschema\serror\sdetection\swhen\sprocessing\sALTER\sTABLE\sDROP\sCOLUMN\scommands.
-D 2021-02-18T19:25:44.637
+C Fix\sDROP\sCOLUMN\sso\sthat\sit\sworks\seven\sif\sthe\suser\shas\sregistered\san\sauthorizer\scallback.
+D 2021-02-18T20:27:46.953
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -475,7 +475,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 2e5a29206228e57739e644dab71f268a5d95348e29fc498aa2c31ccc33229fcc
+F src/alter.c c2d554c43d0e4c3d264f5d9130bc51ebc581ad04c86f998707006ab9b34c25d8
 F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
 F src/attach.c e80162a47411f296bea550ed8fafd730481f4aa71e89ece23ba9c957eed15d4a
 F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
@@ -645,7 +645,7 @@ F test/alter2.test a966ccfcddf9ce0a4e0e6ff1aca9e6e7948e0e242cd7e43fc091948521807
 F test/alter3.test e487958dec7932453e0b83baf21d6b1e71d5e7d9a55bc20eadfa62a51ddffc29
 F test/alter4.test dfd6086faf461b27ca2d2999848dcd207edf23352fc1592d0005c0844f3f08cf
 F test/alterauth.test 63442ba61ceb0c1eeb63aac1f4f5cebfa509d352276059d27106ae256bafc959
-F test/alterauth2.test c0a1ddf5b93d93cb0d15ba7acaf0c5c6fb515bbe861ede75b2d3fabad33b6499
+F test/alterauth2.test 794ac5cef251819fe364b4fe20f12f86e9c5d68070513c7fd26c17cb244c89af
 F test/altercol.test 1d6a6fe698b81e626baea4881f5717f9bc53d7d07f1cd23ee7ad1b931f117ddf
 F test/alterdropcol.test f4fb3a02a7274740769506f2af2eb8cc60aac26a148b71564b79fe3a19acae3b
 F test/alterlegacy.test f38c6d06cda39e1f7b955bbce57f2e3ef5b7cb566d3d1234502093e228c15811
@@ -1902,7 +1902,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 204ee5e28210738fb624a9cf85dc6f9b59de0d7eb4fddd46c8babe9beddd4944
-R 845ed6581bddfe7c8da85d38a6d123ff
+P 565a6fd0c95b438fea7bf84913b38de1718117e16e0d685534a8650e1dc8421b
+R 68a986e7be36e9399d403bc01ee6e384
 U dan
-Z f3602657c19c9bc4f7de01775efae4db
+Z 3cbcbd274cebad95d2a18c7496f951e1
diff --git a/manifest.uuid b/manifest.uuid
index 70e8900803..c10a6b2426 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-565a6fd0c95b438fea7bf84913b38de1718117e16e0d685534a8650e1dc8421b
\ No newline at end of file
+e5f144182bbb3ba10c77151cf63c8bddf86374049fb6866387f85e335df298cb
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index 36cc9f3213..e34a592be0 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -1800,6 +1800,11 @@ static void dropColumnFunc(
   const char *zEnd;
   char *zNew = 0;
 
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  sqlite3_xauth xAuth = db->xAuth;
+  db->xAuth = 0;
+#endif
+
   rc = renameParseSql(&sParse, zDb, db, zSql, iSchema==1);
   if( rc!=SQLITE_OK ) goto drop_column_done;
   pTab = sParse.pNewTable;
@@ -1820,6 +1825,9 @@ static void dropColumnFunc(
 
 drop_column_done:
   renameParseCleanup(&sParse);
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  db->xAuth = xAuth;
+#endif
 }
 
 /*
@@ -1937,7 +1945,6 @@ void sqlite3AlterDropColumn(Parse *pParse, SrcList *pSrc, Token *pName){
 exit_drop_column:
   sqlite3DbFree(db, zCol);
   sqlite3SrcListDelete(db, pSrc);
-  return;
 }
 
 /*
diff --git a/test/alterauth2.test b/test/alterauth2.test
index bd589cda1d..a411408b58 100644
--- a/test/alterauth2.test
+++ b/test/alterauth2.test
@@ -95,4 +95,21 @@ do_auth_test 1.2 {
   {SQLITE_UPDATE sqlite_temp_master sql temp {}}
 }
 
+do_auth_test 1.3 {
+  ALTER TABLE t2 DROP COLUMN c;
+} {
+  {SQLITE_FUNCTION {} like {} {}} 
+  {SQLITE_FUNCTION {} sqlite_drop_column {} {}}
+  {SQLITE_FUNCTION {} sqlite_rename_test {} {}} 
+  {SQLITE_READ sqlite_master name main {}} 
+  {SQLITE_READ sqlite_master sql main {}} 
+  {SQLITE_READ sqlite_master tbl_name main {}} 
+  {SQLITE_READ sqlite_master type main {}} 
+  {SQLITE_READ sqlite_temp_master name temp {}} 
+  {SQLITE_READ sqlite_temp_master sql temp {}} 
+  {SQLITE_READ sqlite_temp_master type temp {}} 
+  {SQLITE_SELECT {} {} {} {}} 
+  {SQLITE_UPDATE sqlite_master sql main {}}
+}
+
 finish_test
-- 
2.47.2