Fix handling of "id=?" corner cases in rtree when the value on the RHS is a real...

FossilOrigin-Name: 027e5336acc26f57f21df4980928731026c30cf88688fa0b66f13ffa0b5da3a0

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 11996d110cd9c0bac07f719cb9725abc3c462b78..f2585bc25fac5d791879a68e9b4040a245dd5bf1 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -1870,7 +1870,7 @@ static int rtreeFilter(
     i64 iNode = 0;
     int eType = sqlite3_value_numeric_type(argv[0]);
     if( eType==SQLITE_INTEGER
-     || (eType==SQLITE_FLOAT && sqlite3_value_double(argv[0])==iRowid)
+     || (eType==SQLITE_FLOAT && (i64)(sqlite3_value_double(argv[0]))==iRowid)
     ){
       rc = findLeafNode(pRtree, iRowid, &pLeaf, &iNode);
     }else{

diff --git a/ext/rtree/rtree1.test b/ext/rtree/rtree1.test
index 61664e1529c428f999db7f7915c847ee709bc4f8..467a523fe59eb89b3597b6cb82cb60717b9f5109 100644 (file)
--- a/ext/rtree/rtree1.test
+++ b/ext/rtree/rtree1.test
@@ -797,4 +797,16 @@ do_test 23.0 {
   db eval {PRAGMA integrity_check;}
 } {ok}
 
+reset_db
+do_execsql_test 24.0 {
+  CREATE VIRTUAL TABLE rt1 USING rtree_i32(rid, c1, c2);
+  INSERT INTO rt1(rid, c1, c2) VALUES (9223372036854775807, 10, 18);
+}
+
+do_execsql_test 1.1 {
+  SELECT (rid = (CAST (9223372036854775807 AS REAL)))
+  FROM rt1 WHERE
+         (rid = (CAST (9223372036854775807 AS REAL)));
+}
+
 finish_test

diff --git a/manifest b/manifest
index 1364d73542df2c57d26270af64299e4b3dab81c2..8808c702a3816409e56e73fabe62bfae03893475 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\scode\sthat\sadded\sa\sP4\sparameter\sto\sthe\sOP_Variable\sopcode.\sThis\sis\sno\slonger\srequired.
-D 2024-03-05T18:41:03.600
+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
 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 1baf9f6aa7251ddecdb019d914df4db46eb227720c00f89c485c66dbfdc7863d
+F ext/rtree/rtree.c 57e5269d7d3c502626dfb3dcb3866cb49f0e965b5b3457c8e8e4c092d9d54d34
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
-F ext/rtree/rtree1.test 2b5b8c719c6a4abe377f57766f428a49af36a93061cb146cccfdc3b30000c0a4
+F ext/rtree/rtree1.test aa738f9956be79de80688ebe515d5b96de75ddd5a8cf3b18819b29f5853ddbdb
 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 8290646792bc5411112b0c01dc5ac0837743056a7679725ee2edefef2e10d146
-R 1ae68caeb21ed926e0c7d42963259d28
+P dd5977c9a8a418be3fbd646d74933996381099a9263a02eb4a990f0084463dc1
+R 0d34808880ac8ee78310466df4068ad3
 U dan
-Z 4bf196184c1c27ebc7d6a427ff362e10
+Z f219ac544948fab5884c3a1cf576bfbe
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 663d96d6149a4b748d5b5552ef75f16130aee8d2..ac34f60cfe089375ded56b2a62f4e1cae9b97edb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dd5977c9a8a418be3fbd646d74933996381099a9263a02eb4a990f0084463dc1
\ No newline at end of file
+027e5336acc26f57f21df4980928731026c30cf88688fa0b66f13ffa0b5da3a0
\ No newline at end of file