]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add support for the Geopoly extension to the R-Tree extension. This also
authordrh <drh@noemail.net>
Mon, 27 Aug 2018 17:13:12 +0000 (17:13 +0000)
committerdrh <drh@noemail.net>
Mon, 27 Aug 2018 17:13:12 +0000 (17:13 +0000)
involves adding the SQLITE_INDEX_CONSTRAINT_FUNCTION capability to the
xFindFunction method of the sqlite3_module object, and to the
sqlite3_index_info.aConstraint.op field in the xBestIndex implementation of
virtual tables.

FossilOrigin-Name: 666133e32ca8e95807f8437dc8401bc93e2e6508ab8e6ae1e6031b7cee1584ae

1  2 
manifest
manifest.uuid
src/whereexpr.c

diff --cc manifest
index 31a0cb26a2ffa0747da98995f2870a58678affde,5d9705d73bff0cf06361bc86bccc3a610d3c319e..a045ef12ab4d7818ca19c97d307b8a0044aa0692
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Set\sSQLITE_PTRSIZE\sto\s4\swhen\scompiling\swith\sxlc\son\s32-bit\sAIX.
- D 2018-08-24T19:04:08.056
 -C Minor\schanges\sto\sthe\svisual01.txt\stest\sscript.
 -D 2018-08-27T17:05:59.920
++C Add\ssupport\sfor\sthe\sGeopoly\sextension\sto\sthe\sR-Tree\sextension.\s\sThis\salso\ninvolves\sadding\sthe\sSQLITE_INDEX_CONSTRAINT_FUNCTION\scapability\sto\sthe\s\nxFindFunction\smethod\sof\sthe\ssqlite3_module\sobject,\sand\sto\sthe\nsqlite3_index_info.aConstraint.op\sfield\sin\sthe\sxBestIndex\simplementation\sof\nvirtual\stables.
++D 2018-08-27T17:13:12.965
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
+ F Makefile.in d06f463c5b623a61ac27f5cb8214fca9e53a6704d34d6b8f2124e2b1b293c88f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 91d78669ce4a4267d6988d16b0bde831ea207e3a2e488efcba558a70dfa45a72
+ F Makefile.msc ab99b4a0aa33f1c0f39587be9df15c9db536acf7859828ff8c51e13eb5082874
  F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
  F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -500,10 -502,10 +502,10 @@@ F src/resolve.c 797088662ed61102485e307
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c ae7396a314cc1bb1d767947cd57094e3a9ffcbb155ebc1b1c391e028c44a9a04
  F src/shell.c.in 6e0aad854be738a5d0368940459399be211e9ac43aebe92bb9ed46cfe38d0e1f
- F src/sqlite.h.in 82b5768e36ce796ecf93c73bd88bad99def831ce7d470138e213ac693bf4ceab
+ F src/sqlite.h.in 5a2d431493020c2c9f2f37c9119d6439444e3c44a714566a5192b6911ac917e6
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
 -F src/sqliteInt.h a5d212bb7ae5cfc0540af6fb09eee2092a45fe083fac4191ee64ff70e7d4d78a
 +F src/sqliteInt.h 2a670143a4f6b7d85958bac125e4d9d8ad14f016a3582e9d7c6907d9d50b75a0
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -586,7 -588,7 +588,7 @@@ F src/walker.c ba7225773931760cf60bf22f
  F src/where.c 155809967fbab889374dedf970ea6561b8fb519fcb165d6ba00776552ecc5cde
  F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
  F src/wherecode.c 2b6cd1b27736cc803060289e04ecf9849976106f4077aa67d1a2c0e3ec420159
- F src/whereexpr.c 94f181d1bc6139973c3677e35b0f1ebfb2b82254620002abb9cb8eb02a58c0b8
 -F src/whereexpr.c fc338d5b42e6d25177aa601ce980247384127aeb9fb6e083e4c783e46569eb9a
++F src/whereexpr.c d87df2c00ecc0c2ef4409562608d19cec259a6a03ca72b86fc999db9c07ce119
  F src/window.c 4b503da928dace3e845b891381a4d98eeb8c5744313ae3643df8d8d21fdcca65
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1755,7 -1757,7 +1757,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P ef6729be85ed106212ed23a024d83b85b709207cf287436c0603a21c659f36ad
- R 0f2d8093aae9a7e4f75df1b87b4bd0e1
- U mistachkin
- Z 5d877bbacdeea49203afbcd3a16fe3ab
 -P 5a0e1541037b5bbc1b4bf26a7da304c9b32ea72960aca8b9309cf2180757c8a4
 -R 57d482752e51750ee238bfa9c4f73bf0
++P d158e5b12eec5b81d54c8f5902a972795423947a21d0212b6cceb2810aa6cc5c 4bc28eed32154be0e62fe69acd30f828c2e6f59c6579618ecad8ecf632a90517
++R 8e52d60c2558b132e89c46c2b2e927ee
++T +closed 4bc28eed32154be0e62fe69acd30f828c2e6f59c6579618ecad8ecf632a90517
+ U drh
 -Z 5dd365657ebaf30e9435a4a7515828ca
++Z 29251fdcd22ade960e4bf01a9382ce41
diff --cc manifest.uuid
index d8f7e24ad955c3cad9ddd720d3de2cfb5c1cdeb7,4a106de8af8ddc2f7836742d2dc2a10777355c3e..450c37349d7cffb40cdf882472138d4d1606a95a
@@@ -1,1 -1,1 +1,1 @@@
- d158e5b12eec5b81d54c8f5902a972795423947a21d0212b6cceb2810aa6cc5c
 -4bc28eed32154be0e62fe69acd30f828c2e6f59c6579618ecad8ecf632a90517
++666133e32ca8e95807f8437dc8401bc93e2e6508ab8e6ae1e6031b7cee1584ae
diff --cc src/whereexpr.c
Simple merge