Further refinements to the sqlite_offset() fix from [6029514b08b88e3f].

FossilOrigin-Name: 98799d7bbb6d62d71862d5fdfe87856995dd179d66612e369c5dc440e7fac31a

diff --git a/manifest b/manifest
index 1aa0f12d3a4316acd2f4bf4db85e15484085b7e9..498ac0cdac41b5d67f6d18f45e2405a3a066d9e5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\ssqlite_dbpage\svirtual\stable\sso\sthat\sit\sstarts\sa\swrite\stransaction\non\sall\sattached\sschemas.
-D 2022-03-09T14:29:33.828
+C Further\srefinements\sto\sthe\ssqlite_offset()\sfix\sfrom\s[6029514b08b88e3f].
+D 2022-03-09T18:30:55.068
 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 5c5a380bfb13a6964a7ab4d3780f9b4fd2b40457f4bfd2b85224d326f4a3bae1
+F src/where.c b6f15969cadadd050cb9e43e77af76c7b073fd0247c486f0364427b56336f0c2
 F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
 F src/wherecode.c 84be340684393248b9f3ecbce9b87c8a6f818149b52302702ea0b8d2a9d51faf
 F src/whereexpr.c 2a71f5491798460c9590317329234d332d9eb1717cba4f3403122189a75c465e
@@ -1944,9 +1944,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 ce9e3d903c2e5993a3fdadaf809ce2026efd1b5b933930b50dd794c9a7329cdd
-Q +642a0b4752743216271e4f855a465515ef7f6a985f280251e18d67e3d5fb694b
-R 011b43d5b75b42fd099ba29065742c94
+P e92c4fdb99eb09507e6b970067c1a6f2043838f67017125851469d66c1bb5b20
+Q +6f838305e2c848a43b210bd1b7b962fb9e3c41de34de778675e6578fcd99f397
+R 6b70aba7e9a6ee118c941ad8e6e46cec
 U drh
-Z ce7755c4e14defd51dd85e0e89e5b557
+Z 5e0335561fd30b791f1b081df1b63b8e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 49db8641af3cfc4e3e04deff81afaceb7c0c516d..bca8fc2987f3c06db936f5fb825fb9977651e471 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e92c4fdb99eb09507e6b970067c1a6f2043838f67017125851469d66c1bb5b20
\ No newline at end of file
+98799d7bbb6d62d71862d5fdfe87856995dd179d66612e369c5dc440e7fac31a
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 9ce65c42b217265b9ad08375f152e8c4939e8a67..6705c4d36b586dbd78e7db5f417da77337772f59 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -6150,6 +6150,10 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
             Index *pPk = sqlite3PrimaryKeyIndex(pTab);
             x = pPk->aiColumn[x];
             assert( x>=0 );
+#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
+          }else if( pOp->opcode==OP_Offset ){
+            /* Do not need to translate the column number */
+#endif
           }else{
             testcase( x!=sqlite3StorageColumnToTable(pTab,x) );
             x = sqlite3StorageColumnToTable(pTab,x);