From: drh <drh@noemail.net>
Date: Mon, 24 Sep 2018 19:41:12 +0000 (+0000)
Subject: Allow a writable virtual table to have a schema with an INTEGER PRIMARY KEY
X-Git-Tag: version-3.25.2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4c1fdafd3948862127fd374e7bfff4e797a50fd;p=thirdparty%2Fsqlite.git

Allow a writable virtual table to have a schema with an INTEGER PRIMARY KEY
and WITHOUT ROWID.  This fixes ticket
[f25d5ceebe1d710ff61a571e395356869d8272ef].  Test case in TH3.

FossilOrigin-Name: 3139af9910e484682d37eeac9dca188a73859b3241017bde31bc6cb597b40d3c
---

diff --git a/manifest b/manifest
index 28485c04e6..6ae4c984a1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sfaulty\sassert()\sin\sthe\svalidation\slogic\sfor\sthe\sLEFT\sJOIN\sstrength\nreduction\soptimization.\s\sProblem\sfound\sby\sOSSFuzz.
-D 2018-09-24T19:32:16.510
+C Allow\sa\swritable\svirtual\stable\sto\shave\sa\sschema\swith\san\sINTEGER\sPRIMARY\sKEY\nand\sWITHOUT\sROWID.\s\sThis\sfixes\sticket\n[f25d5ceebe1d710ff61a571e395356869d8272ef].\s\sTest\scase\sin\sTH3.
+D 2018-09-24T19:41:12.240
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
@@ -445,7 +445,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c 3f5e1a03db871e627bf5da21092bf7434ecfc5c5980bbd7d45eba13341340173
 F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
-F src/build.c 3bdd61d7ecba6f40e7efead3ffb61b2e3bad87de73f407c288035937c9b33687
+F src/build.c 0b3d422770877d74ee6d54f4c122d82c48f7d04ee3bfb91702e402de7f5c45ac
 F src/callback.c 36caff1e7eb7deb58572d59c41cee8f064a11d00297616995c5050ea0cfc1288
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c b157b01081f92442f8b0218ddb93ddce8ebddad36dbddeecfdd771561dd4f387
@@ -1765,8 +1765,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8a82fcf05fa84def1433489f71dc28b47c1e082d044512b8756ec1bb4b913fab
-Q +2fd62fccd13e326dbd7dd730112542c6faa56e466bf4f7b8e22ced543031280c
-R cd533f606a3f6ed5965d62855a238855
+P 8694c3d565f6f8209e24230765efa476e10048abb69a300b9df5cbaa45824ab8
+Q +5a38d9281b4ad63b853efa5cdd5ad4a64b19dfaf8250ef8e0e186684df1211ea
+R eeb48d42c18c8e67bdcc3851a0756248
 U drh
-Z 567acba726ea34d997b341fee438cc18
+Z ca5171cd2aeb1aca88d661e57a661354
diff --git a/manifest.uuid b/manifest.uuid
index 4a0193422c..c01e09c25f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8694c3d565f6f8209e24230765efa476e10048abb69a300b9df5cbaa45824ab8
\ No newline at end of file
+3139af9910e484682d37eeac9dca188a73859b3241017bde31bc6cb597b40d3c
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 65b9107118..b4041389ba 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1771,10 +1771,6 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){
     }
   }
 
-  /* The remaining transformations only apply to b-tree tables, not to
-  ** virtual tables */
-  if( IN_DECLARE_VTAB ) return;
-
   /* Convert the P3 operand of the OP_CreateBtree opcode from BTREE_INTKEY
   ** into BTREE_BLOBKEY.
   */