In the rtree extension, actively suppress extra tokens on the column names,

and be pedantic about column affinities.  Ticket [367a86e28859f1ff]

FossilOrigin-Name: 97fb5a72f91a44d579466e67c33aa862384c4d1c95c2010cf4ae9dbd172bbcfb

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 76078e97fd10a0f0733856cf18f3a2f3e5f026ac..5944a7ef80696763edc697879c60f62bbe3fa4b7 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -62,6 +62,7 @@
 #else
   #include "sqlite3.h"
 #endif
+int sqlite3GetToken(const unsigned char*,int*); /* In the SQLite core */
 
 #ifndef SQLITE_AMALGAMATION
 #include "sqlite3rtree.h"
@@ -3661,6 +3662,14 @@ static int getNodeSize(
   return rc;
 }
 
+/*
+** Return the length of a token
+*/
+static int rtreeTokenLength(const char *z){
+  int dummy = 0;
+  return sqlite3GetToken((const unsigned char*)z,&dummy);
+}
+
 /* 
 ** This function is the implementation of both the xConnect and xCreate
 ** methods of the r-tree virtual table.
@@ -3726,16 +3735,18 @@ static int rtreeInit(
   ** the r-tree table schema.
   */
   pSql = sqlite3_str_new(db);
-  sqlite3_str_appendf(pSql, "CREATE TABLE x(%s INT", argv[3]);
+  sqlite3_str_appendf(pSql, "CREATE TABLE x(%.*s INT", 
+                      rtreeTokenLength(argv[3]), argv[3]);
   for(ii=4; ii<argc; ii++){
-    if( argv[ii][0]=='+' ){
+    const char *zArg = argv[ii];
+    if( zArg[0]=='+' ){
       pRtree->nAux++;
-      sqlite3_str_appendf(pSql, ",%s", argv[ii]+1);
+      sqlite3_str_appendf(pSql, ",%s", zArg+1);
     }else if( pRtree->nAux>0 ){
       break;
     }else{
       pRtree->nDim2++;
-      sqlite3_str_appendf(pSql, ",%s", argv[ii]);
+      sqlite3_str_appendf(pSql, ",%.*s NUM", rtreeTokenLength(zArg), zArg);
     }
   }
   sqlite3_str_appendf(pSql, ");");

diff --git a/ext/rtree/rtree1.test b/ext/rtree/rtree1.test
index 485ebeb4973db65c6b3f25c4a1c742ce0d6fb430..85075854ed96d35c46e5738423d73c8040e27b9f 100644 (file)
--- a/ext/rtree/rtree1.test
+++ b/ext/rtree/rtree1.test
@@ -705,5 +705,14 @@ do_execsql_test 17.2 {
   REINDEX;
 } {}
 
+reset_db
+do_execsql_test 18.0 {
+  CREATE VIRTUAL TABLE rt0 USING rtree(c0, c1, c2);
+  INSERT INTO rt0(c0,c1,c2) VALUES(9,2,3);
+  SELECT c0 FROM rt0 WHERE rt0.c1 > '-1'; 
+  SELECT rt0.c1 > '-1' FROM rt0;
+} {9 1}
+
+
 expand_all_sql db
 finish_test

diff --git a/ext/rtree/rtree2.test b/ext/rtree/rtree2.test
index 853737b9c7d9533180297d8958d505438e12f87a..31c191481e2a799e6f0213fa316537675ae74467 100644 (file)
--- a/ext/rtree/rtree2.test
+++ b/ext/rtree/rtree2.test
@@ -33,12 +33,13 @@ if {[info exists G(isquick)] && $G(isquick)} {
 }
 
 foreach module {rtree_i32 rtree} {
+  if {$module=="rtree_i32"} {set etype INT} {set etype REAL}
   for {set nDim 1} {$nDim <= 5} {incr nDim} {
   
     do_test rtree2-$module.$nDim.1 {
       set cols [list]
       foreach c [list c0 c1 c2 c3 c4 c5 c6 c7 c8 c9] {
-        lappend cols "$c REAL"
+        lappend cols "$c $etype"
       }
       set cols [join [lrange $cols 0 [expr {$nDim*2-1}]] ", "]
       execsql " 

diff --git a/manifest b/manifest
index bf3d8d51642e6a55f3ffedac1b0c2e11598a230d..4ca14c1840675b796284dbf1d9e5bf825c2c58bb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\scheck-in\s[b7810062ec2489e1]\swas\snot\squite\sright\sin\sthat\sit\sallowed\san\noversized\sshift\soperation\s(which\sis\sUB\sin\sC)\son\ssome\sobscure\sinputs.\s\sOSSFuzz\nfound\sthe\sproblem\sfor\sus\sovernight.
-D 2019-12-06T11:48:27.693
+C In\sthe\srtree\sextension,\sactively\ssuppress\sextra\stokens\son\sthe\scolumn\snames,\nand\sbe\spedantic\sabout\scolumn\saffinities.\s\sTicket\s[367a86e28859f1ff]
+D 2019-12-06T13:10:29.260
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -380,10 +380,10 @@ 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 1f08e535c2e34b301fda49211cbf063f2dae7a31683f2fe261a48ef4f7d0378b
+F ext/rtree/rtree.c f1dace13854706121ec2369d5685d90e83dcfd1698585b0fd4a99f021a44da32
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
-F ext/rtree/rtree1.test 891193aaf1009e2f50c45f5b855df6c8b1428a3b3d22803f3e30cca65cd9f283
-F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
+F ext/rtree/rtree1.test 686216b4181f64b1d27e786fbea053a9fb27cddb983d9bfe4bebb6e5f0d30d90
+F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
 F ext/rtree/rtree3.test 4ee5d7df86040efe3d8d84f141f2962a7745452200a7cba1db06f86d97050499
 F ext/rtree/rtree4.test 304de65d484540111b896827e4261815e5dca4ce28eeecd58be648cd73452c4b
 F ext/rtree/rtree5.test 49c9041d713d54560b315c2c7ef7207ee287eba1b20f8266968a06f2e55d3142
@@ -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 32772dfd50b602c049d8c30bc28cde60a18b7495a997d728081f689ff417c956
-R 1c03acd087c3699b97e3d620797db9c3
+P 62f2235adf796c72882b26313489cf49804ec3ec4972e0eee5034176cbb07f84
+R 1b112b7a4f0b3a3e64226b121a4ea4a7
 U drh
-Z ab13954c7c4fd96013e313a189fb6632
+Z e237feeb1e17ed643316e435de3125ba

diff --git a/manifest.uuid b/manifest.uuid
index a763b50303601f615396ed9eeb0ea1ba1432009b..eaa19a12429ca9f5bf75189fb60792f8b7989520 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-62f2235adf796c72882b26313489cf49804ec3ec4972e0eee5034176cbb07f84
\ No newline at end of file
+97fb5a72f91a44d579466e67c33aa862384c4d1c95c2010cf4ae9dbd172bbcfb
\ No newline at end of file