Make sure the rowid of an RTREE virtual table has integer affinity.

Ticket [9fe487ba3c064b4e]

FossilOrigin-Name: 7ae8c0d52f6aa7f27537216f85456ef49dade040366cfb250c789206ecd4dc5a

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 6bb31066767a931382757d7eec77857440fdd335..08d8e057c08c59b90c70b0980f4c0e40a4725678 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -3726,7 +3726,7 @@ static int rtreeInit(
   ** the r-tree table schema.
   */
   pSql = sqlite3_str_new(db);
-  sqlite3_str_appendf(pSql, "CREATE TABLE x(%s", argv[3]);
+  sqlite3_str_appendf(pSql, "CREATE TABLE x(%s INT", argv[3]);
   for(ii=4; ii<argc; ii++){
     if( argv[ii][0]=='+' ){
       pRtree->nAux++;

diff --git a/ext/rtree/rtreeC.test b/ext/rtree/rtreeC.test
index 19a1f7fe6c2a1ee7563122b9b06c7dcf290a78a7..47ca3ad7b9950d0fc762394cd62e9eb64b79a269 100644 (file)
--- a/ext/rtree/rtreeC.test
+++ b/ext/rtree/rtreeC.test
@@ -177,7 +177,7 @@ do_execsql_test 4.3 {
 #
 reset_db
 do_execsql_test 5.1 {
-  CREATE TABLE t1(x PRIMARY KEY, y);
+  CREATE TABLE t1(x INT PRIMARY KEY, y);
   CREATE VIRTUAL TABLE rt USING rtree(id, x1, x2, +d1);
 
   INSERT INTO t1(x) VALUES(1);

diff --git a/manifest b/manifest
index 60e294005a14ce3d5aa74d2a0d8910d0808c204c..83677eb9568d6fd2b0a4c9fb8918bf9ad11dd35e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sALTER\sTABLE\sthat\scould\soccur\sif\san\sindex,\sview\sor\strigger\sin\sthe\sschema\sfeatures\san\sexpression\sof\sthe\sform\s((SELECT\s...)\sIN\s())\swhere\sthe\sSELECT\sstatement\suses\sa\sCTE.
-D 2019-12-05T14:31:43.291
+C Make\ssure\sthe\srowid\sof\san\sRTREE\svirtual\stable\shas\sinteger\saffinity.\nTicket\s[9fe487ba3c064b4e]
+D 2019-12-05T14:42:26.047
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -380,7 +380,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c c591164125808f8bba9659e92665b78412cd263e654b6f05294f3a8da7cdd9fb
-F ext/rtree/rtree.c 615434285a07d8579abf593adf27a44c5129c941682faa61fcccd54c7fcaf7c2
+F ext/rtree/rtree.c a71937b3834ab5754ffe606ea19a1058ceb866b49b48fe83c9b9c33096e8a182
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 1b84301b1593eac1f1d52a11eb7bccabe6f40f6d3c77ef0d1f5a2b204a4823d4
 F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
@@ -393,7 +393,7 @@ F ext/rtree/rtree8.test 2d99006a1386663978c9e1df167554671e4f711c419175b39f332719
 F ext/rtree/rtree9.test c646f12c8c1c68ef015c6c043d86a0c42488e2e68ed1bb1b0771a7ca246cbabf
 F ext/rtree/rtreeA.test ed2f1be9c06dde0b1ab93a95dd9e87eeaa02db2d30bcb4b9179b69ee3dc3319b
 F ext/rtree/rtreeB.test 4cec297f8e5c588654bbf3c6ed0903f10612be8a2878055dd25faf8c71758bc9
-F ext/rtree/rtreeC.test 128928549d22b65c381ab1366760d08703cd75e34f6a7a506ece38f9330b7282
+F ext/rtree/rtreeC.test 6aa87eba4d9a3003b941a1ba77db259c5cabc3fd92fc5a6360f5369520eb9a4d
 F ext/rtree/rtreeD.test fe46aa7f012e137bd58294409b16c0d43976c3bb92c8f710481e577c4a1100dc
 F ext/rtree/rtreeE.test e65d3fc625da1800b412fc8785817327d43ccfec5f5973912d8c9e471928caa9
 F ext/rtree/rtreeF.test 81ffa7ef51c4e4618d497a57328c265bf576990c7070633b623b23cd450ed331
@@ -1851,7 +1851,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d43e0efb9642037dd751cfed13438e71cfceb50e14a0ec603880c6c3be2e93b1
-R b58e1f299cd5b016826b90792dcea0ec
-U dan
-Z 953edf0d5755745db90637efba7dd73c
+P 7e5ad8e0ab7ee91a5ccb19a9654d6a036233f74d2fdc45f7315feb3d9d035fd4
+R dd1fb900cbe23ca898a64778b6b34b3b
+U drh
+Z 957df8bc79d16338794e83c1c0d47a72

diff --git a/manifest.uuid b/manifest.uuid
index 15af2abaf5f13455c5a00318bc260aa471a3f24a..bee7ae6b2c118371f616f698583d41f74c9e2180 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e5ad8e0ab7ee91a5ccb19a9654d6a036233f74d2fdc45f7315feb3d9d035fd4
\ No newline at end of file
+7ae8c0d52f6aa7f27537216f85456ef49dade040366cfb250c789206ecd4dc5a
\ No newline at end of file