/ Check-in [4b8cfe7b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix the JSON extension so that it can be compiled separately from the amalgamation.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 4b8cfe7bfe5f049eb4607fd480429fcd2060e691891d8bffc9917f13fa373988
User & Date: drh 2018-07-07 20:23:46
Context
2018-07-07
20:26
Fix another problem with reusing LSM cursors for range scans. check-in: ae3fc765 user: dan tags: trunk
20:23
Fix the JSON extension so that it can be compiled separately from the amalgamation. check-in: 4b8cfe7b user: drh tags: trunk
20:13
Fix an LSM problem caused by using the same cursor for equality and range scans. check-in: f05bead3 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to ext/misc/json1.c.

  1844   1844     sqlite3_value **argv
  1845   1845   ){
  1846   1846     int i;
  1847   1847     int inStr = 0;
  1848   1848     char *z;
  1849   1849     JsonString *pStr;
  1850   1850     pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
         1851  +#ifdef NEVER
  1851   1852     /* pStr is always non-NULL since jsonArrayStep() or jsonObjectStep() will
  1852   1853     ** always have been called to initalize it */
  1853   1854     if( NEVER(!pStr) ) return;
         1855  +#endif
  1854   1856     z = pStr->zBuf;
  1855   1857     for(i=1; z[i]!=',' || inStr; i++){
  1856   1858       assert( i<pStr->nUsed );
  1857   1859       if( z[i]=='"' ){
  1858   1860         inStr = !inStr;
  1859   1861       }else if( z[i]=='\\' ){
  1860   1862         i++;