From: drh <>
Date: Wed, 6 Mar 2024 12:28:55 +0000 (+0000)
Subject: Correction to the previous check-in.
X-Git-Tag: version-3.46.0~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a64342ee9cca331cddda4c2c241d593c7516c999;p=thirdparty%2Fsqlite.git

Correction to the previous check-in.

FossilOrigin-Name: 483fa2969e1e10cd8e8d2f9e3027871c65b1360b6c23897efe3ce63a3a55ae13
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index f2585bc25f..a24304a8ac 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -1870,7 +1870,9 @@ static int rtreeFilter(
     i64 iNode = 0;
     int eType = sqlite3_value_numeric_type(argv[0]);
     if( eType==SQLITE_INTEGER
-     || (eType==SQLITE_FLOAT && (i64)(sqlite3_value_double(argv[0]))==iRowid)
+     || (eType==SQLITE_FLOAT 
+         && (i64)(sqlite3_value_double(argv[0]))==iRowid
+         && (double)iRowid==sqlite3_value_double(argv[0]))
     ){
       rc = findLeafNode(pRtree, iRowid, &pLeaf, &iNode);
     }else{
diff --git a/ext/rtree/rtree1.test b/ext/rtree/rtree1.test
index 467a523fe5..e596df71d5 100644
--- a/ext/rtree/rtree1.test
+++ b/ext/rtree/rtree1.test
@@ -803,10 +803,16 @@ do_execsql_test 24.0 {
   INSERT INTO rt1(rid, c1, c2) VALUES (9223372036854775807, 10, 18);
 }
 
-do_execsql_test 1.1 {
+do_execsql_test 24.1 {
   SELECT (rid = (CAST (9223372036854775807 AS REAL)))
   FROM rt1 WHERE
          (rid = (CAST (9223372036854775807 AS REAL)));
 }
 
+do_execsql_test 24.2 {
+  DELETE FROM rt1;
+  INSERT INTO rt1(rid, c1, c2) VALUES(1,2,3);
+  SELECT * FROM rt1 WHERE rid=1.005;
+} {}
+
 finish_test
diff --git a/manifest b/manifest
index 8808c702a3..da94066647 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\shandling\sof\s"id=?"\scorner\scases\sin\srtree\swhen\sthe\svalue\son\sthe\sRHS\sis\sa\sreal\svalue.
-D 2024-03-06T11:35:36.090
+C Correction\sto\sthe\sprevious\scheck-in.
+D 2024-03-06T12:28:55.128
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -506,9 +506,9 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c 0dd4775e896cee6067979d67aff7c998e75c2c9d9cd8d62a1a790c09cde7adca
-F ext/rtree/rtree.c 57e5269d7d3c502626dfb3dcb3866cb49f0e965b5b3457c8e8e4c092d9d54d34
+F ext/rtree/rtree.c d87dfef2dd8ee2360898857187b9f763e90dcee9cf98f3f487ec473b6ae30db3
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
-F ext/rtree/rtree1.test aa738f9956be79de80688ebe515d5b96de75ddd5a8cf3b18819b29f5853ddbdb
+F ext/rtree/rtree1.test e0608db762b2aadca0ecb6f97396cf66244490adc3ba88f2a292b27be3e1da3e
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
 F ext/rtree/rtree3.test 272594f88c344e973864008bbe4c71fd3a41a264c097d568593ee7886d83d409
 F ext/rtree/rtree4.test 304de65d484540111b896827e4261815e5dca4ce28eeecd58be648cd73452c4b
@@ -2176,8 +2176,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 dd5977c9a8a418be3fbd646d74933996381099a9263a02eb4a990f0084463dc1
-R 0d34808880ac8ee78310466df4068ad3
-U dan
-Z f219ac544948fab5884c3a1cf576bfbe
+P 027e5336acc26f57f21df4980928731026c30cf88688fa0b66f13ffa0b5da3a0
+R ee785ecad1867a820bb9e665fd92d3e8
+U drh
+Z 74daf43f110405d8b8bf503998b8174f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ac34f60cfe..dba854ccd3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-027e5336acc26f57f21df4980928731026c30cf88688fa0b66f13ffa0b5da3a0
\ No newline at end of file
+483fa2969e1e10cd8e8d2f9e3027871c65b1360b6c23897efe3ce63a3a55ae13
\ No newline at end of file