The previous assert() fix was not correct when building with

-DSQLITE_ENABLE_OFFSET_SQL_FUNC.  This is the fix.

FossilOrigin-Name: c0a4767fef27cfe4fdc1d8a29342998095894769a63d84e37ec47ced7ce4e5f7

diff --git a/manifest b/manifest
index 5acc5b6e83b5e62f1e78bd4efd0c41d83e1c56e5..a21751cf679501a7843e5d4efb2a01435ea532e9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sassert()\sthat\sattempts\sto\sverify\sthat\sthe\stable-reference\sto\nindex-reference\stranslator\sfinds\sall\srequired\stranslations.\n[forum:/forumpost/929168fdd6|Forum\spost\s929168fdd6].
-D 2022-03-21T13:47:15.347
+C The\sprevious\sassert()\sfix\swas\snot\scorrect\swhen\sbuilding\swith\n-DSQLITE_ENABLE_OFFSET_SQL_FUNC.\s\sThis\sis\sthe\sfix.
+D 2022-03-21T15:42:42.783
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -639,7 +639,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c afb9fcb03016e277d65e4d679d8533b0e132d3d683ced9d37735d0423160d480
+F src/where.c b071160c771d396c82b7d37e901834b5b58544811200cdbf14fffc8f982c4224
 F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
 F src/wherecode.c 555f598a9ddad81761f084710fdb4f8733fe31bc14cd6b19f8ca4274a7eaa04c
 F src/whereexpr.c 2a71f5491798460c9590317329234d332d9eb1717cba4f3403122189a75c465e
@@ -1945,8 +1945,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 23fdb169ca1622369cd44fd641946c37fef09071625838b3b9c86c31244ed205
-R 4c2caf4c6925c27f263ef9f6fe474f74
+P fa9bd1fce47e8db1cfc4cd8efd2c09f8711ea917ce7d116dc7226c575cb9a6d4
+R fc8ee44bd759c8bce21e1507c043ba2f
 U drh
-Z 8e55e0e30dab82e26d51680d64fa738f
+Z 03ce4b7e2beed66af6c911c254018f05
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d2b24cee2e65f96caba4b693ae9a667ec0a9d85b..33d9d5649fa7dd2095deb4a65369d08fb7d62416 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fa9bd1fce47e8db1cfc4cd8efd2c09f8711ea917ce7d116dc7226c575cb9a6d4
\ No newline at end of file
+c0a4767fef27cfe4fdc1d8a29342998095894769a63d84e37ec47ced7ce4e5f7
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index afa0d3038d41b2af542ecbb5b60165bd27bbf2ec..97eaac8ba577a0ef47414ed76a35a7da808ff935 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -6193,6 +6193,9 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
             */
             assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
                  || cursorIsOpen(v,pOp->p1,k)
+#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
+                 || pOp->opcode==OP_Offset
+#endif
             );
           }
         }else if( pOp->opcode==OP_Rowid ){