Fix the build with -DSQLITE_OMIT_VIRTUALTABLE.

FossilOrigin-Name: 752918def7231f7846b3e985c9953a1cc825ab6b

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index af20c691faa9049142fa0fcbc7ffd855e89184df..aad5c57fdc2c3c72eb9ea1cc490ca647f44f8a7e 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1397,6 +1397,7 @@ static void jsonValidFunc(
   sqlite3_result_int(ctx, rc);
 }
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
 /****************************************************************************
 ** The json_each virtual table
 ****************************************************************************/
@@ -1854,6 +1855,7 @@ static sqlite3_module jsonTreeModule = {
   0,                         /* xRelease */
   0                          /* xRollbackTo */
 };
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
 
 /****************************************************************************
 ** The following routine is the only publically visible identifier in this
@@ -1897,6 +1899,7 @@ int sqlite3_json_init(
     { "json_nodecount",       1, 0,   jsonNodeCountFunc     },
 #endif
   };
+#ifndef SQLITE_OMIT_VIRTUALTABLE
   static const struct {
      const char *zName;
      sqlite3_module *pModule;
@@ -1904,6 +1907,7 @@ int sqlite3_json_init(
     { "json_each",            &jsonEachModule               },
     { "json_tree",            &jsonTreeModule               },
   };
+#endif
   SQLITE_EXTENSION_INIT2(pApi);
   (void)pzErrMsg;  /* Unused parameter */
   for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
@@ -1912,8 +1916,10 @@ int sqlite3_json_init(
                                  (void*)&aFunc[i].flag,
                                  aFunc[i].xFunc, 0, 0);
   }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
   for(i=0; i<sizeof(aMod)/sizeof(aMod[0]) && rc==SQLITE_OK; i++){
     rc = sqlite3_create_module(db, aMod[i].zName, aMod[i].pModule, 0);
   }
+#endif
   return rc;
 }

diff --git a/manifest b/manifest
index 89d83b2549631b9d30001d8eb6192d4d63d66fce..6dcf2619a0cec3670da6891091631372a6ff4a94 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sconsider\san\sempty\sstring\sto\sbe\svalid\sJSON.\s\sAdd\ssome\sadditional\nJSON\stest\scases.
-D 2015-08-29T16:02:37.845
+C Fix\sthe\sbuild\swith\s-DSQLITE_OMIT_VIRTUALTABLE.
+D 2015-08-29T17:22:33.763
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e2218eb228374422969de7b1680eda6864affcef
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -192,7 +192,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767
 F ext/misc/ieee754.c b0362167289170627659e84173f5d2e8fee8566e
-F ext/misc/json1.c 232a3125fc468e9075f569b1b543b797fd4e0f81
+F ext/misc/json1.c 5f39a87bf0697cca51e05a83cc5597a431d504de
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
@@ -282,7 +282,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
-F src/build.c 97f682229876834abad515a0a48759a967999ed0
+F src/build.c 511b02138eddc3cf68dab1016da4998260093e9f
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
 F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@ -1380,7 +1380,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3aa0855fd463076fc3277f1d9fe00d2f30e6b449
-R 3daa1648ff31e492e4e517b1729e3cd5
+P fd19ff029f128f478f69910352a6f8b84262ce1d
+R 9a4be85e9706d5dbc0e9b26aa7664d5f
 U drh
-Z 4768dfaa3613e1e500aa484aea396edc
+Z 792dcf72d6ff70af8eda2770d6871186

diff --git a/manifest.uuid b/manifest.uuid
index e78d4becc0a9163dea2b5412c9d36b5aa576d29e..71b6d8e22e139ac74a6614e068f6a9c0b5fa6491 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fd19ff029f128f478f69910352a6f8b84262ce1d
\ No newline at end of file
+752918def7231f7846b3e985c9953a1cc825ab6b
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 0960d0cbdf9159d86f205a120f8a2d925d5997e1..e7b8b2315d6192af956a8a328ce63ffd8712a18a 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -356,7 +356,7 @@ Table *sqlite3LocateTable(
   p = sqlite3FindTable(pParse->db, zName, zDbase);
   if( p==0 ){
     const char *zMsg = isView ? "no such view" : "no such table";
-#ifndef SQLITE_OMIT_VIRTUAL_TABLE
+#ifndef SQLITE_OMIT_VIRTUALTABLE
     /* If zName is the not the name of a table in the schema created using
     ** CREATE, then check to see if it is the name of an virtual table that
     ** can be an eponymous virtual table. */