Fix a bad assert in RENAME COLUMN.

dbsqlfuzz 3f0a7245b69cd08617d7d7781ebaedb0fe765a93.

FossilOrigin-Name: f13e0d12f137cd6b4e83e92bd36652431d8416e6eed4797313e061f2e390d39b

diff --git a/manifest b/manifest
index d4e9562ac96b55c07f10f203dfbc2f83cf6316e9..f0d5012b445d883065228e0044d5cb8c1484cff0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\scompiler\swarning\sin\sappendvfs.c
-D 2021-03-08T16:29:06.986
+C Fix\sa\sbad\sassert\sin\sRENAME\sCOLUMN.\ndbsqlfuzz\s3f0a7245b69cd08617d7d7781ebaedb0fe765a93.
+D 2021-03-08T17:17:38.979
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 99618c6098c02b5e4ca73f8861895ad94539d37103e5058e00b519d9bdf23b5d
+F src/alter.c 1f9383846b52e655d40479a5a5659bf60300ed43f7467e6e85d66588ba48f51b
 F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
 F src/attach.c 9cbe761e464025694df8e6f6ee4d9f41432c3a255ca9443ccbb4130eeb87cf72
 F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
@@ -641,7 +641,7 @@ F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 2f65ec8132e0ca896de550b9908094d49ad65a99116a9d79deeb6017604ad4f6
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 2ecb8bbd52416642e41c9081182a8df05d42c75637afd4488aace78cc4b69e13
-F test/alter.test 25e109787dc5e631e117eb6e1c57f96a572bb51228db3b4f8b5f41d665e2ccaa
+F test/alter.test f53d8a4ecd35f051c07e54a36beec5d0a30d30a9d98bc723f6cde6afbfb3c5ca
 F test/alter2.test a966ccfcddf9ce0a4e0e6ff1aca9e6e7948e0e242cd7e43fc091948521807687
 F test/alter3.test e487958dec7932453e0b83baf21d6b1e71d5e7d9a55bc20eadfa62a51ddffc29
 F test/alter4.test dfd6086faf461b27ca2d2999848dcd207edf23352fc1592d0005c0844f3f08cf
@@ -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 79281603b951b438303130820deb6b05baeca366c2cd93be7d8909d3232bcc96
-R e360fdd513841cb62b5b2f6db5e2d59e
+P f538961a8058cc327d64c8ec317f1b4f8bbb604f90261160c6c27f26f4800682
+R 97bfa854862dba47ba656835586ffccf
 U drh
-Z 0f21e4d86da337cea1ec1ab7f49e9219
+Z e3079ed2e9e97deefa6bfe1e3658f244

diff --git a/manifest.uuid b/manifest.uuid
index f4765b2cf31c71b0999fc4bb86a16c2ecca6176f..7f6cf1e8fc7518ab67d3c95014f9fc3abb4a8998 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f538961a8058cc327d64c8ec317f1b4f8bbb604f90261160c6c27f26f4800682
\ No newline at end of file
+f13e0d12f137cd6b4e83e92bd36652431d8416e6eed4797313e061f2e390d39b
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index e5a3f3b71cafb0320e1666dab93bbe4fca5bc056..72697f860c0bfec24371c3db74dfbdd69f9fded6 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -1241,9 +1241,8 @@ static int renameResolveTrigger(Parse *pParse){
           rc = sqlite3ResolveExprListNames(&sNC, pStep->pExprList);
         }
         assert( !pStep->pUpsert || (!pStep->pWhere && !pStep->pExprList) );
-        if( pStep->pUpsert ){
+        if( pStep->pUpsert && rc==SQLITE_OK ){
           Upsert *pUpsert = pStep->pUpsert;
-          assert( rc==SQLITE_OK );
           pUpsert->pUpsertSrc = pSrc;
           sNC.uNC.pUpsert = pUpsert;
           sNC.ncFlags = NC_UUpsert;

diff --git a/test/alter.test b/test/alter.test
index 43d2a6d5ae71ee5a180e998b0c85e8deeeceae34..634e318e3d563168c5123a79b658c1156370ca7c 100644 (file)
--- a/test/alter.test
+++ b/test/alter.test
@@ -903,4 +903,16 @@ ifcapable rtree {
   } {1 1.0 2.0 3 1.5 3.5}
 }
 
+# 2021-03-08 dbsqlfuzz 3f0a7245b69cd08617d7d7781ebaedb0fe765a93
+reset_db
+do_catchsql_test alter-18.1 {
+  CREATE TABLE t1(a,b,c);
+  CREATE TABLE log(a INTEGER PRIMARY KEY,b,c);
+  CREATE TRIGGER tr1 AFTER INSERT ON t1 BEGIN
+    INSERT INTO logx(a,b,c) VALUES(new.a,new.b,new.c)
+    ON CONFLICT(a) DO UPDATE SET c=excluded.c, b=new.b;
+  END;
+  ALTER TABLE log RENAME COLUMN a TO x;
+} {1 {error in trigger tr1: no such table: main.logx}}
+
 finish_test