Fix the geopoly_json() SQL function so that it works.

FossilOrigin-Name: 236588d573a007c9c9eb8e337387d3b6318d19c8b8f260fa7324ed8c4e17060b

diff --git a/ext/misc/geopoly.c b/ext/misc/geopoly.c
index 12476971d9ee9f0ea15ce656aa6a310a54a43265..351fbe70511fa05e371f4f6b58223c19229ef15b 100644 (file)
--- a/ext/misc/geopoly.c
+++ b/ext/misc/geopoly.c
@@ -319,7 +319,7 @@ static void geopolyJsonFunc(
 ){
   GeoPoly *p = geopolyFuncParam(context, argv[0]);
   if( p ){
-    sqlite3 *db = sqlite3_context_db_pointer(context);
+    sqlite3 *db = sqlite3_context_db_handle(context);
     sqlite3_str *x = sqlite3_str_new(db);
     int i;
     sqlite3_str_append(x, "[", 1);

diff --git a/manifest b/manifest
index bb63b6e40e4c8bf689819b29575fc4423bd2e9cf..74a1319ecf006856eef7db1a73ebd52018d8f2fb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sfrom\strunk\sthe\sability\sto\suse\ssqlite3_sql\sinterfaces\sin\sextensions.
-D 2018-05-09T15:19:41.906
+C Fix\sthe\sgeopoly_json()\sSQL\sfunction\sso\sthat\sit\sworks.
+D 2018-05-09T15:20:47.783
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -279,7 +279,7 @@ F ext/misc/dbdump.c 69ef1be5b210538f77dfcc6fcb55b4b5f5e98b1e0bcfd67d818711e10761
 F ext/misc/eval.c 6ea9b22a5fa0dd973b67ca4e53555be177bc0b7b263aadf1024429457c82c0e3
 F ext/misc/fileio.c 48c7751c78fc4cdd29d8c862fd2f3f98bbfefa2a3cf1ca1496df4bf02eb8cded
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
-F ext/misc/geopoly.c 4b2bd1bec87c687e4156826e971ef4890a7387b7f9fcbe57a1088d432483579e
+F ext/misc/geopoly.c 6f2fe66fdb97d4ed794d3f1ca2f984aa84d2d731704f5d0ec0ed5ef242a921d4
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
 F ext/misc/json1.c dbe086615b9546c156bf32b9378fc09383b58bd17513b866cfd24c1e15281984
 F ext/misc/memvfs.c ab36f49e02ebcdf85a1e08dc4d8599ea8f343e073ac9e0bca18a98b7e1ec9567
@@ -1729,7 +1729,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 25695c80a01d18bc533d6c741076452dfc0063b1e632da346e254062ec01acbe 0e809cdcbd1bb1e269298814d6bb1dcdaea48c5b0bb20e0e1caa4dba27654873
-R 0200861d14387bc336ac9e6d2f852523
+P 5bb9e6a9f19f9d73314b08afbecb13f46b0cf7b27bfb567960d8f60e3a7a74a1
+R 19ac43755ffa82d1ceb67768a613f870
 U drh
-Z fb13d8bc92e12d2d3ea6a5bd13f1350a
+Z f8290016445a89aa601b008a34a72134

diff --git a/manifest.uuid b/manifest.uuid
index 2f192c2231a1eaae644d93cd29dcb3ae6f8b8cc4..135ebb78dc75fbf44a1943ba3897d5eca2fe446c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5bb9e6a9f19f9d73314b08afbecb13f46b0cf7b27bfb567960d8f60e3a7a74a1
\ No newline at end of file
+236588d573a007c9c9eb8e337387d3b6318d19c8b8f260fa7324ed8c4e17060b
\ No newline at end of file