From: dan <dan@noemail.net>
Date: Wed, 1 Feb 2017 14:10:24 +0000 (+0000)
Subject: Changes so that the pre-update hook and the sessions module work with WITHOUT
X-Git-Tag: version-3.17.0~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f62154d4ac581d7ebcb7bc9a13b807e2b4a4e76e;p=thirdparty%2Fsqlite.git

Changes so that the pre-update hook and the sessions module work with WITHOUT
ROWID tables.

FossilOrigin-Name: 964bdc27f8f1b1db2e5c0c2a65c8156614cbe087
---

f62154d4ac581d7ebcb7bc9a13b807e2b4a4e76e
diff --cc manifest
index 3a5177423f,27e85ecd7b..01669f9e0e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C More\sRTREE\sperformance\soptimizations\srelated\sto\sdecoding\svalues.
- D 2017-02-01T02:25:28.535
 -C Add\sa\sspeed-test\sprogram\sfor\sthe\ssessions\smodule.
 -D 2017-01-31T17:31:30.384
++C Changes\sso\sthat\sthe\spre-update\shook\sand\sthe\ssessions\smodule\swork\swith\sWITHOUT\nROWID\stables.
++D 2017-02-01T14:10:24.369
  F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@@ -458,12 -460,12 +460,12 @@@ F src/update.c 456d4a4656f8a03c2abc88a5
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c a88b0466fddf445ce752226d4698ca3faada620a
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c d3765f4d8f667b8d10232b2a1d0498497f3ac09f
 -F src/vdbe.c 57f41c8c74ceb757abbd4cda72c44fc40d57f425
++F src/vdbe.c ec059d331da77cb2e3e8af3fb7e40443ed148fbd
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
- F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
- F src/vdbeapi.c 7a65f10684982daecfce50f557f2632b7f20b198
- F src/vdbeaux.c 6847b02aa2db536ed15d90f1fdc2923afef93c5b
+ F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
+ F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
+ F src/vdbeaux.c b9a36e530e6525ca9d9a685bc7b1d01fa77b5cf8
 -F src/vdbeblob.c 2b3d1ad915dbe5dc92c48759dc18fa8c697e78e5
 +F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
@@@ -1549,7 -1551,7 +1552,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 9663eea2a16bb4eec71476d307a3722a768308c3
- R 5d2055e5a67aa8455e161eeb4945e6a1
- U drh
- Z 3923bc85bfbb1c570a9230cd663fc66b
 -P 4a592abbc555fd3b70979b551b00c2ba631253df
 -R 26510e2a956656dcc1737b93ae2b12d3
++P c5395e7496d0cd593f5e16ee5f6719d020dc0c66 25f1275fe3e940c1d9a7b013cb3744304b2eda1e
++R f7a2435ee7007416912dcdfda9016a2c
+ U dan
 -Z cbd41882cd0513167229b7a965b152d9
++Z 84db606ff358cb3acbf24f0cef50dec1
diff --cc manifest.uuid
index becf54d88b,13dd835345..f45e6e6220
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c5395e7496d0cd593f5e16ee5f6719d020dc0c66
 -25f1275fe3e940c1d9a7b013cb3744304b2eda1e
++964bdc27f8f1b1db2e5c0c2a65c8156614cbe087
diff --cc src/vdbe.c
index 049c8243f6,5462e541c5..c8b3db8cf2
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@@ -4402,11 -4403,10 +4402,10 @@@ case OP_InsertInt: 
      assert( pC->iDb>=0 );
      zDb = db->aDb[pC->iDb].zDbSName;
      pTab = pOp->p4.pTab;
-     assert( HasRowid(pTab) );
+     assert( (pOp->p5 & OPFLAG_ISNOOP) || HasRowid(pTab) );
      op = ((pOp->p5 & OPFLAG_ISUPDATE) ? SQLITE_UPDATE : SQLITE_INSERT);
    }else{
 -    pTab = 0; /* Not needed.  Silence a comiler warning. */
 +    pTab = 0; /* Not needed.  Silence a compiler warning. */
      zDb = 0;  /* Not needed.  Silence a compiler warning. */
    }