Ignore type affinity for auxiliary columns in RTREE as it is too error-prone

to try to parse out the type from other constraints.
Ticket [8bf76328ac940d52]

FossilOrigin-Name: 7fa664ea0ea1e0283a9af50c9ff8dd360ee6042f9e491a136f53d9bcbbc9c7ef

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 4eae4c09f9ef59c48b3ac365515670d9bea523e2..b4d15f6cb306e41349c966dfda7f6d8e530875d9 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -3741,7 +3741,7 @@ static int rtreeInit(
     const char *zArg = argv[ii];
     if( zArg[0]=='+' ){
       pRtree->nAux++;
-      sqlite3_str_appendf(pSql, ",%s", zArg+1);
+      sqlite3_str_appendf(pSql, ",%.*s", rtreeTokenLength(zArg+1), zArg+1);
     }else if( pRtree->nAux>0 ){
       break;
     }else{

diff --git a/manifest b/manifest
index 089f9bf88f5ddf8427d48177aa76c0bc5e167770..13b2b3eb23f54ab3d49ee6af2bd8a23e76d38011 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sforeign\skeys\sand\sgenerated\scolumns\sdiscovered\sby\nManuel\sRigger.
-D 2019-12-07T00:22:18.329
+C Ignore\stype\saffinity\sfor\sauxiliary\scolumns\sin\sRTREE\sas\sit\sis\stoo\serror-prone\nto\stry\sto\sparse\sout\sthe\stype\sfrom\sother\sconstraints.\nTicket\s[8bf76328ac940d52]
+D 2019-12-07T12:13:54.568
 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 cb9d3634d9e198136f24eada199feb3ce146048b47a58e21e24c8aadf2c253ba
+F ext/rtree/rtree.c 26fcb3f7a92fda9afcf5eee684cc3188b7367da69bc9c374492d844fb8ed4e25
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 4092a8bd2b5eafc4fafe4fe9024249c12b13e4bab23c2c3eaff57412fdf805fa
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -1852,7 +1852,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 ef73107f475e40e6bdd8b722e96992070f81fd2b7a3cb718ec8f251c89ca3e81
-R aaef2d23c9db8d375ded121b4d30b560
+P 27c0fdab1ba4d4993b164eb4b777c63e82aa247c3fa406121dc8ed94970a0b35
+R c4c99c18b38e792981fdfe73d89fd7cc
 U drh
-Z 7e4775d6900f8a2f69645687a14dafa0
+Z 43f98335107433765402de610e0caa2a

diff --git a/manifest.uuid b/manifest.uuid
index dbd5ce31c786d7cd549350ea8aded8eefe6502c6..d4a49074c96d6087a1914544ac2ae0234f84222d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-27c0fdab1ba4d4993b164eb4b777c63e82aa247c3fa406121dc8ed94970a0b35
\ No newline at end of file
+7fa664ea0ea1e0283a9af50c9ff8dd360ee6042f9e491a136f53d9bcbbc9c7ef
\ No newline at end of file