From: drh <drh@noemail.net>
Date: Wed, 17 Jul 2019 12:49:16 +0000 (+0000)
Subject: Fix the WITHOUT ROWID table logic so that it generates a correct KeyInfo
X-Git-Tag: version-3.30.0~218
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3db3d12cd11b60c47e52050eb3e83a67b7664d0f;p=thirdparty%2Fsqlite.git

Fix the WITHOUT ROWID table logic so that it generates a correct KeyInfo
object for tables that have a PRIMARY KEY containing the same column used
more than once with different collating sequences.  Enhance the index_xinfo
pragma to assist in testing the above. Fix for ticket [fd3aec0c7e3e2998].

FossilOrigin-Name: 84a51a755c18ac8253080db6eec505df894ee3b1e97cfa8e61039ac38001e270
---

3db3d12cd11b60c47e52050eb3e83a67b7664d0f
diff --cc manifest
index a8092147c6,6997d73f69..8e7cfbf9d6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\scasts\sto\sshell.c.in\sto\savoid\swarnings\son\ssystems\swhere\ssize_t\sis\s32\sbits.
- D 2019-07-17T07:23:06.341
 -C New\stest\scases\sfor\sPRAGMA\sindex_xinfo\son\sa\sWITHOUT\sROWID\stable.\s\sAnd\snew\ntestcases\susing\sindex_xinfo\sto\sverify\sthat\sWITHOUT\sROWID\stables\sare\nconstructed\scorrectly.
 -D 2019-07-17T12:42:15.670
++C Fix\sthe\sWITHOUT\sROWID\stable\slogic\sso\sthat\sit\sgenerates\sa\scorrect\sKeyInfo\nobject\sfor\stables\sthat\shave\sa\sPRIMARY\sKEY\scontaining\sthe\ssame\scolumn\sused\nmore\sthan\sonce\swith\sdifferent\scollating\ssequences.\s\sEnhance\sthe\sindex_xinfo\npragma\sto\sassist\sin\stesting\sthe\sabove.\sFix\sfor\sticket\s[fd3aec0c7e3e2998].
++D 2019-07-17T12:49:16.424
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1835,7 -1836,7 +1836,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 9e66458592d40fbd96ea5f21339573110ca1cfe328238a020c9420a87d35dd72
- R e10a56ffab89aeb6c132764d41933ce5
- U dan
- Z 0a446b49c5cd11f0249e04708e61ac08
 -P 62274ff683ba077d8b0fa34ad653ce235a8c5cbfdb7ab8558469af7333d03698
++P fe014288ac03cdf0dc5410b7d45cad4768759b52746c0a22bce2fc03779c5d5a 340378c1e60da80263523776f4b6366a9d332a7ee25986637e8b157f4e8e4bd3
+ R 5f5f2ffbc62c0e7052c26dec78f9d9ee
++T +closed 340378c1e60da80263523776f4b6366a9d332a7ee25986637e8b157f4e8e4bd3
+ U drh
 -Z 9fdc925cff7a2aeb5d3ee2a9b3931134
++Z a8a117274901c94c5f21fbb39eeada13
diff --cc manifest.uuid
index 3b782b72f6,1d1b25efef..f902dda7df
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fe014288ac03cdf0dc5410b7d45cad4768759b52746c0a22bce2fc03779c5d5a
 -340378c1e60da80263523776f4b6366a9d332a7ee25986637e8b157f4e8e4bd3
++84a51a755c18ac8253080db6eec505df894ee3b1e97cfa8e61039ac38001e270