More consistent column names. Cherry-pick of

[09834279] and [0c38dde45] as a fix for ticket [de3403bf5ae].

FossilOrigin-Name: be0e24a0293f31b81fc5608a1d5aa1e57d3f5f7dddef6b368ae2e207bbdaf44c

diff --cc manifest
index 256c4f777df33dd5c94b01208d5f9b8530478299,ea3d2d59361a11bf57a6006a619483014751c779..ab36828d3fbdd96b7a06db618c7f89fea668101b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Correctly\shandle\san\s"INTEGER\sPRIMARY\sKEY\sUNIQUE"\scolumn\sin\sa\sWITHOUT\sROWID\ntable.\s\sThis\sis\sa\sfix\sfor\sticket\s[bc115541132dad136]\scherry-picked\sfrom\n[5216bfb73f1a49bdd].
- D 2017-07-30T20:30:36.264
 -C New\stest\scases\sfor\scolumn\sname\sgeneration\sinteracting\swith\sthe\squery\sflattener.
 -D 2017-07-29T17:02:22.699
++C More\sconsistent\scolumn\snames.\s\sCherry-pick\sof\n[09834279]\sand\s[0c38dde45]\sas\sa\sfix\sfor\sticket\s[de3403bf5ae].
++D 2017-07-31T17:40:15.444
  F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@@ -452,13 -452,13 +452,13 @@@ F src/printf.c 8757834f1b54dae512fb25eb
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c c6bf96a7f9d7d68f929de84738c599a30d0a725ab0b54420e70545743cd5ee7b
+ F src/select.c 31b35ddf55f1021f7148a01306984b057c11ebb6e3463d94677225e0a1e301a3
  F src/shell.c bd6a37cbe8bf64ef6a6a74fdc50f067d3148149b4ce2b4d03154663e66ded55f
  F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
 -F src/sqlite.h.in 0e2603c23f0747c5660669f946e231730af000c76d1653b153dcf2c26fce0a6b
 +F src/sqlite.h.in a7e29d5977916cded93ff6cf0d56ada657e13e91adbc2039e5cf02e41122a45f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 0f9f72b86a3792314f5db7a1dfbc2c82376bcd8d0919ceb80637bca126ec3c68
 -F src/sqliteInt.h a1b8df420e8fa80fda9414ab7784d6e62271e1f7d65034ffd3e906ee6f014def
 +F src/sqliteInt.h bd6be75bc43d38ada272ef0b3472bc44ef0cc15536bea22c349ca1a2812a19ce
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1637,8 -1637,7 +1637,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 c965b757bb5faed20d44d442e673cdad40dd12726f4f968105636501a021e41c
- Q +5216bfb73f1a49bdd879d470de139bf46a212474eaf6f38ad2390536d66a2afd
- R 79592fa95afa9126178bbce2b79db007
 -P 09834279aeca3bda63de684a369ed64f2cbf587b5f5df1454c0a3c009a1337ad
 -R 67883e010f09f35ff4da8532a7b615d9
++P 5c8cb1ff5da872fb5ab3f77f678b9df3b68525433f6d5d918f2911a5622bdd14 0c38dde4543d6183a6ab0b7b3b75819f56c47704756a2426d54d3f20468d78d8
++R 8550eb0362d36c7e3ef03e8f100c7ce0
  U drh
- Z f693467a5eb5af0544217307e1418286
 -Z d8a6008eca97bd8ffc0a711cdb6dfcd3
++Z be23c278f6fcd3e72481f62a234ad5ef

diff --cc manifest.uuid
index 45219cb6bec71379f714ce67f68dabc231af386c,9e8657dbe97900e6e31086ab3303f0c1ab82cabd..3755f1c36dbd91d652d9b7ca1af3d6f6453493a7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5c8cb1ff5da872fb5ab3f77f678b9df3b68525433f6d5d918f2911a5622bdd14
 -0c38dde4543d6183a6ab0b7b3b75819f56c47704756a2426d54d3f20468d78d8
++be0e24a0293f31b81fc5608a1d5aa1e57d3f5f7dddef6b368ae2e207bbdaf44c