SQLite: Check-in [ec003958]

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

Overview

Comment:	Fix fuzzcheck.c so that it assumes that JSON1 is already compiled in and does not need to be initialized further.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| dll-build-fix
Files:	files \| file ages \| folders
SHA1:	ec003958359d6b69b1b1a75be2a988796268e063
User & Date:	drh 2015-10-14 19:44:42

Context

2015-10-14
19:52		Fixes to the JSON1 extension and its use by fuzzcheck to avoid problems when building DLLs. (check-in: 01d3ee7b user: drh tags: trunk)
19:44		Fix fuzzcheck.c so that it assumes that JSON1 is already compiled in and does not need to be initialized further. (Closed-Leaf check-in: ec003958 user: drh tags: dll-build-fix)
18:45		Avoid exporting sqlite3_json_init() from amalgamation builds. (check-in: 8463f7e7 user: dan tags: dll-build-fix)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/fuzzcheck.c.

  1122   1122           openFlags = SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE;
  1123   1123           if( nativeFlag && pDb->sz==0 ){
  1124   1124             openFlags |= SQLITE_OPEN_MEMORY;
  1125   1125             zVfs = 0;
  1126   1126           }
  1127   1127           rc = sqlite3_open_v2("main.db", &db, openFlags, zVfs);
  1128   1128           if( rc ) fatalError("cannot open inmem database");
  1129         -#ifdef SQLITE_ENABLE_JSON1
  1130         -        {
  1131         -          extern int sqlite3_json_init(sqlite3*);
  1132         -          sqlite3_json_init(db);
  1133         -        }
  1134         -#endif
  1135   1129           if( cellSzCkFlag ) runSql(db, "PRAGMA cell_size_check=ON", runFlags);
  1136   1130           setAlarm(iTimeout);
  1137   1131   #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
  1138   1132           if( sqlFuzz || vdbeLimitFlag ){
  1139   1133             sqlite3_progress_handler(db, 100000, progressHandler, &vdbeLimitFlag);
  1140   1134           }
  1141   1135   #endif