From: drh <>
Date: Sun, 2 Jan 2022 17:14:39 +0000 (+0000)
Subject: Remove an obsolete assert() statement that no longer does anything useful
X-Git-Tag: version-3.37.2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a6393e96e8d4a485e49712ceda884438f7ac80c;p=thirdparty%2Fsqlite.git

Remove an obsolete assert() statement that no longer does anything useful
and which is not always true.  Fix for PoC #1 of
[forum:/forumpost/b03d86f951|forum post b03d86f951].

FossilOrigin-Name: 0829c1001bcfadf0d0af2b2c2e01ed60b24156b7c4e7c49cb29f3002ce8e36db
---

diff --git a/manifest b/manifest
index b8725ffe7d..526feaeaf8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sfaulty\sassert()\sstatement\s-\sadding\sa\sCORRUPT_DB\sterm\s-\sbased\son\sa\stest\ncase\sderived\sfrom\s[562805cf488a455c].\s\sAlso\sadd\sa\stest\scase\sto\sthat\sprior\nissue.
-D 2022-01-02T17:13:36.819
+C Remove\san\sobsolete\sassert()\sstatement\sthat\sno\slonger\sdoes\sanything\suseful\nand\swhich\sis\snot\salways\strue.\s\sFix\sfor\sPoC\s#1\sof\n[forum:/forumpost/b03d86f951|forum\spost\sb03d86f951].
+D 2022-01-02T17:14:39.992
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -512,7 +512,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 3bec59e34f7b6078c73e21dd97aee2a7830a3096afe7b9541a14f273e7f709ec
+F src/insert.c 04c9b133be6152b4f229aab8e38230b3bf6d2e7e76455a893bff5f70e566237b
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c
 F src/main.c 1ea70751e6005ab6a9f784730fa0919efaa6639440a287deb73cb711e5aae57a
@@ -1816,7 +1816,7 @@ F test/with4.test 257be66c0c67fee1defbbac0f685c3465e2cad037f21ce65f23f86084f1982
 F test/with5.test 6248213c41fab36290b5b73aa3f937309dfba337004d9d8434c3fabc8c7d4be8
 F test/with6.test 661d7e416bef6c0a2556b2c9f0c8178a5b15932bed65246abed99723a8d4e7c0
 F test/withM.test 693b61765f2b387b5e3e24a4536e2e82de15ff64
-F test/without_rowid1.test df3de14f1cc422d2b0f9b79969b5ef8e51c86ed87834ab35fb5139403e7f5a03
+F test/without_rowid1.test 78fd9b437f4cdb46f76e6a510d545334e4f58e3e4ce37aaf19384eda5b27de8c
 F test/without_rowid2.test af260339f79d13cb220288b67cd287fbcf81ad99
 F test/without_rowid3.test 39ab0dd773eaa62e59b17093f875327630f54c4145458f6d2b053d68d4b2f67b
 F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a
@@ -1934,9 +1934,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6e08a542ad6af7032e5badcdd50a8ed95c07bf7b15ae2b62334376b75a2e9731
-Q +0dd6b5fccd554ebe4c0b081601863acd7b6ea81b51e14b508b23244f2a570e7e
-R 546f8af2140b29fdcd963f6678b5f14a
+P f9505fcb28d05ac2319a56d936f840b8de502a49dda16ded8b7ed9dd9dffe509
+Q +c76a4c0b3cb625017ba09c8bccfcf1b5826df6873f1d3705d3345716079d5ec9
+R 9c9f90a8c5433106ee9946676382899a
 U drh
-Z bcfdef18e85690bf0e291dc88ba3992a
+Z f0f2168f738e3f36ed6fb9a9c15641f3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 208ebf351e..48db83fc6d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f9505fcb28d05ac2319a56d936f840b8de502a49dda16ded8b7ed9dd9dffe509
\ No newline at end of file
+0829c1001bcfadf0d0af2b2c2e01ed60b24156b7c4e7c49cb29f3002ce8e36db
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index c3316b826b..7fc9a89720 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -2549,7 +2549,6 @@ void sqlite3CompleteInsertion(
     }
     pik_flags = (useSeekResult ? OPFLAG_USESEEKRESULT : 0);
     if( IsPrimaryKeyIndex(pIdx) && !HasRowid(pTab) ){
-      assert( pParse->nested==0 );
       pik_flags |= OPFLAG_NCHANGE;
       pik_flags |= (update_flags & OPFLAG_SAVEPOSITION);
       if( update_flags==0 ){
diff --git a/test/without_rowid1.test b/test/without_rowid1.test
index c712392688..1191115527 100644
--- a/test/without_rowid1.test
+++ b/test/without_rowid1.test
@@ -470,5 +470,20 @@ ifcapable altertable {
     EXPLAIN QUERY PLAN SELECT * FROM dual, t1 WHERE a=10 AND b=10;
   } {~/b=/}
 }
-  
+
+# 2022-01-01 https://sqlite.org/forum/forumpost/b03d86f951 PoC #1
+# Omit an assert() from 2013 that no longer serves any purpose and
+# is no longer always true.
+#
+reset_db
+do_execsql_test 15.1 {
+  PRAGMA writable_schema=ON;
+  CREATE TABLE sqlite_sequence (name PRIMARY KEY) WITHOUT ROWID;
+  PRAGMA writable_schema=OFF;
+  CREATE TABLE c1(x);
+  INSERT INTO sqlite_sequence(name) VALUES('c0'),('c1'),('c2');
+  ALTER TABLE c1 RENAME TO a;
+  SELECT name FROM sqlite_sequence ORDER BY +name;
+} {a c0 c2}
+
 finish_test