From: dan <dan@noemail.net>
Date: Wed, 28 Nov 2018 08:02:28 +0000 (+0000)
Subject: Fixes for SQLITE_OMIT_VIRTUAL_TABLE builds.
X-Git-Tag: version-3.26.0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6e015fab916454ddf425a8e72ecd4779debb697;p=thirdparty%2Fsqlite.git

Fixes for SQLITE_OMIT_VIRTUAL_TABLE builds.

FossilOrigin-Name: 9bcdec85e21a5228c700f7373b92ae7ea14b585bcda34235b605be4f7ec15a15
---

diff --git a/manifest b/manifest
index 2515cee27b..6b52bf26b8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Always\senable\sSQLITE_ENABLE_DESERIALIZE\sfor\sthe\sMSVC\smakefile\sas\sthis\sis\snecessary\nto\sget\sreleasetest.tcl\sto\swork.
-D 2018-11-28T01:45:05.333
+C Fixes\sfor\sSQLITE_OMIT_VIRTUAL_TABLE\sbuilds.
+D 2018-11-28T08:02:28.491
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 15f0851eb3754e37de848d5f8ab24146cf677b44ac38353a2c23e39c999aa422
@@ -450,14 +450,14 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c ba7c7eef4461790f37c309936bfc5d0d6ba9b194b02d3c8ff1fd53b420ea6d3b
 F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
-F src/build.c 06b417bd39eb08e0dac3c9d5eac678b5758905265e656bb9768f0f2fe7e35582
+F src/build.c 127d33ad57b455a9339e9fabff41284c8b030cc6247ca7a2a6c0ad7abfc1ce85
 F src/callback.c 789bd33d188146f66c0dd8306472a72d1c05f71924b24a91caf6bd45cf9aba73
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
 F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c 3c8bd4e77f0244fd2bd7cc90acf116ad2f8e82d70e536637f35ac2bc99b726f9
-F src/delete.c cec65c0e74be7492cafba1b77580732b0b1a41a4dbc4ac70909ac44b65b2a20b
+F src/delete.c f7938125847e8ef485448db5fbad29acb2991381a02887dd854c1617315ab9fb
 F src/expr.c 9aacc0b72348ba90010b672dcbbbe2fa56e1182043bc917a3a147b2bc57a5497
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 972a4ba14296bef2303a0abbad1e3d82bc3c61f9e6ce4e8e9528bdee68748812
@@ -469,7 +469,7 @@ F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 6b81aae27b196925d8ff78824f4bbd435d6a40cd38dc324685e21735bb402109
 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
-F src/loadext.c 448eab53ecdb566a1259ee2d45ebff9c0bc4a2cf393774488775c33e4fbe89bf
+F src/loadext.c 9050dd153b5583804184be9c9dee9ebb554178d6db1f8ac280899e8aad9060e6
 F src/main.c 4cfb3913cc9e65d3ac649b1785ac753fc225d29425d5437e012f7eac0cefe0eb
 F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@ -1779,7 +1779,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 0ea049f342d11c676e148239e45d252164081362e921a4beb735d6899eb77344
-R 5b2bedbde38622eb3b4b8e0ce1595cd8
-U drh
-Z 19d2adb068a71d48f3c35d776d8cde00
+P d362dedba3637013d654f2a890fc7b61476f2adeb6bf3bffb4e715c1d1d0b7c2
+R 872bd9c6d2a78862ca6b3fc30df0308d
+U dan
+Z aede78a0ea603f7d034d95c2462ff354
diff --git a/manifest.uuid b/manifest.uuid
index 702c117799..75d5d6fc0c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d362dedba3637013d654f2a890fc7b61476f2adeb6bf3bffb4e715c1d1d0b7c2
\ No newline at end of file
+9bcdec85e21a5228c700f7373b92ae7ea14b585bcda34235b605be4f7ec15a15
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index bed8295072..e0fed8a83f 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1899,6 +1899,7 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){
   recomputeColumnsNotIndexed(pPk);
 }
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
 /*
 ** Return true if zName is a shadow table name in the current database
 ** connection.
@@ -1924,6 +1925,9 @@ static int isShadowTableName(sqlite3 *db, char *zName){
   if( pMod->pModule->xShadowName==0 ) return 0;
   return pMod->pModule->xShadowName(zTail+1);
 }
+#else
+# define isShadowTableName(x,y) 0
+#endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
 
 /*
 ** This routine is called to report the final ")" that terminates
diff --git a/src/delete.c b/src/delete.c
index 157e1a8de1..4ba8e4256d 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -70,9 +70,11 @@ static int tabIsReadOnly(Parse *pParse, Table *pTab){
     return sqlite3WritableSchema(db)==0 && pParse->nested==0;
   }
   assert( pTab->tabFlags & TF_Shadow );
-  return (db->flags & SQLITE_Defensive)!=0
-           && db->nVdbeExec==0
-           && db->pVtabCtx==0;
+  return (db->flags & SQLITE_Defensive)!=0 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+          && db->pVtabCtx==0
+#endif
+          && db->nVdbeExec==0;
 }
 
 /*
diff --git a/src/loadext.c b/src/loadext.c
index 710227d7c4..966d2ddac2 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -84,6 +84,7 @@
 # define sqlite3_declare_vtab 0
 # define sqlite3_vtab_config 0
 # define sqlite3_vtab_on_conflict 0
+# define sqlite3_vtab_collation 0
 #endif
 
 #ifdef SQLITE_OMIT_SHARED_CACHE