Fix the JSON extension so that it can be compiled separately from the

amalgamation.

FossilOrigin-Name: 4b8cfe7bfe5f049eb4607fd480429fcd2060e691891d8bffc9917f13fa373988

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index f4f3507eb2a6786b3cddc6afe5217a09f008f56b..57b0f9c7c5526160c96c1f96b21b9ff65cddee74 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1848,9 +1848,11 @@ static void jsonGroupInverse(
   char *z;
   JsonString *pStr;
   pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
+#ifdef NEVER
   /* pStr is always non-NULL since jsonArrayStep() or jsonObjectStep() will
   ** always have been called to initalize it */
   if( NEVER(!pStr) ) return;
+#endif
   z = pStr->zBuf;
   for(i=1; z[i]!=',' || inStr; i++){
     assert( i<pStr->nUsed );

diff --git a/manifest b/manifest
index e1d8179dcadb3e141af308ba86addf9c1ab5fd6f..4a4ada0fecd1c36a6b3c9daa9539e0624a1a6a65 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sLSM\sproblem\scaused\sby\susing\sthe\ssame\scursor\sfor\sequality\sand\srange\nscans.
-D 2018-07-07T20:13:32.703
+C Fix\sthe\sJSON\sextension\sso\sthat\sit\scan\sbe\scompiled\sseparately\sfrom\sthe\namalgamation.
+D 2018-07-07T20:23:46.817
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -281,7 +281,7 @@ F ext/misc/eval.c 6ea9b22a5fa0dd973b67ca4e53555be177bc0b7b263aadf1024429457c82c0
 F ext/misc/fileio.c 48c7751c78fc4cdd29d8c862fd2f3f98bbfefa2a3cf1ca1496df4bf02eb8cded
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c 0af57bdc87936345a0198c7b0ccca1d8f3bca7d8f4d3c157b335620c78e7363d
+F ext/misc/json1.c f5dc3b295db0ce88549c3ba13c7433efecfb74b80087663c638e67c9c753e7f6
 F ext/misc/memvfs.c ab36f49e02ebcdf85a1e08dc4d8599ea8f343e073ac9e0bca18a98b7e1ec9567
 F ext/misc/mmapwarm.c 70b618f2d0bde43fae288ad0b7498a629f2b6f61b50a27e06fae3cd23c83af29
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
@@ -1745,7 +1745,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 fdef2a921d451c66ca535021d08af3ec1ab53283da2d2979378a799fd8731ef9
-R 9bf8d4422d287c0c0efb3b4bda1c617d
-U dan
-Z c81820453c426810f93bdde5e2c49fcf
+P f05bead371d41ca5beef1f82e4c920c90e2eb9cd9fd537a5c91973bf9bd4eedb
+R 616db2e38aab8dbe40d723034c2ec165
+U drh
+Z e80665d045601ffc0b281bf3fb95a878

diff --git a/manifest.uuid b/manifest.uuid
index ee53efa43d04cccef530dd2b4befa618aa1aa3a1..8e5f7f6a7340ac63f6eda93a69a9ed2fc9a8b2f0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f05bead371d41ca5beef1f82e4c920c90e2eb9cd9fd537a5c91973bf9bd4eedb
\ No newline at end of file
+4b8cfe7bfe5f049eb4607fd480429fcd2060e691891d8bffc9917f13fa373988
\ No newline at end of file