Fix the patch on this branch so that it works with sub-queries, as well as views.

FossilOrigin-Name: 7480db307c39b86bce269583e5917f5e1a3990500552fd98400ef3e7088c0b2a

diff --git a/manifest b/manifest
index 6be75380f061c1f659a40d5d8dd418bcda7cf3a3..b6c90dbbcdaa604db43233feea9d05cf8d2a4753 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C One\sof\stwo\soptions\son\show\sto\saddress\sticket\s[61c853857f40da49].\s\sIn\sthis\nmode,\swe\sback\sout\sthe\sdocumentation\schange\sof\n[https://www.sqlite.org/docsrc/info/07b7749da88d54e5|[07b7749da88d54e5]]\nand\schange\sthe\score\sto\swork\sas\sit\shas\sbeen\sdocumented\sto\swork\ssince\s2017,\nrather\sthan\show\sit\shas\sactually\sworked\ssince\s2009.
-D 2019-08-05T19:32:06.820
+C Fix\sthe\spatch\son\sthis\sbranch\sso\sthat\sit\sworks\swith\ssub-queries,\sas\swell\sas\sviews.
+D 2019-08-05T19:44:47.542
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -523,7 +523,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3ed5a3de18b455366771a89241283fef16508a7f681af546296e95e81458efeb
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c 5b0ef2a8b392fad19d1c8ceb803ab82a2e5ddf34d7f138cabb0a00d0a4c9d646
+F src/select.c 196bc4990e765cbebc0d2e99fb468a454da857372189a0a035aefdd138fb2db1
 F src/shell.c.in e5351f14716065d6e00a0437d3910cbb1a9d4fa96af61f59f18e5623679fe605
 F src/sqlite.h.in dfe86c132b5085e00cf0539c78510b75e60d740191804c9848e8bb7aa850fff5
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -613,7 +613,7 @@ F src/where.c dee31d6842a8f6acd54bc7a7c2505050cd0fa52228634187195bc0b64eb9c240
 F src/whereInt.h 2bb9632f90a1a32952d43a52587209cdd536c3548715d7859bf0c1f9a65a2efd
 F src/wherecode.c 5dd20651afc1f67bad35523514e87f017295f1cddfdf5d1ea31a8e299d7054a8
 F src/whereexpr.c 5e559bdd24b06e3bc2e68f258bf751302954dc1e432daf71fdd8098a71462326
-F src/window.c 8da008a1a6f4db73e1462e88fadb2e05809bd557e4e40d1c37339fecc8b998c1
+F src/window.c 773d7f89e4f20270eaf6315e2707cfd8f4ca1e991604c60be69f1959d6569a75
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1838,10 +1838,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 a29f2a7d07beff64e489e8f824babc6228c4a499fadc0ee701caa60a63baadcd
-R 97414c81c0b4f69819c6816648005997
-T *branch * tkt-61c853-A
-T *sym-tkt-61c853-A *
-T -sym-trunk *
-U drh
-Z 92b9b582014c94f15af3528987c407cd
+P 09cd0c0c6e6c963e0039a733876e5149adb3cd10e9b92699fa1dcb0633e997a4
+R 8160d312ef65c6c22225d62347d07efe
+U dan
+Z 1b28e450eef7b9a84f216281fe844a90

diff --git a/manifest.uuid b/manifest.uuid
index 99fe1f741b632e251081ff941bf8fa33957578a7..4ad83f906359cf7c6f333d4d7ab7ebb46771996f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-09cd0c0c6e6c963e0039a733876e5149adb3cd10e9b92699fa1dcb0633e997a4
\ No newline at end of file
+7480db307c39b86bce269583e5917f5e1a3990500552fd98400ef3e7088c0b2a
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 2133cf48ad1eebb51e371b0d7bbe6ebf4a12d242..d3e4fd24603183f09b05d2ecd32104e7ddd88d1a 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5196,9 +5196,7 @@ static void selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){
       Select *pSel = pFrom->pSelect;
       if( pSel ){
         while( pSel->pPrior ) pSel = pSel->pPrior;
-        sqlite3SelectAddColumnTypeAndCollation(
-          pParse, pTab, pSel, SQLITE_AFF_BLOB
-        );
+        sqlite3SelectAddColumnTypeAndCollation(pParse, pTab, pSel, 0);
       }
     }
   }

diff --git a/src/window.c b/src/window.c
index 665bd2cdcdb6466acd7e162fa1bcac92c8b34ae5..ef62ddda3c717658d758b342d44c99079e059199 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -994,7 +994,7 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
       p->pSrc->a[0].pSelect = pSub;
       sqlite3SrcListAssignCursors(pParse, p->pSrc);
       pSub->selFlags |= SF_Expanded;
-      pTab2 = sqlite3ResultSetOfSelect(pParse, pSub, SQLITE_AFF_BLOB);
+      pTab2 = sqlite3ResultSetOfSelect(pParse, pSub, 0);
       if( pTab2==0 ){
         rc = SQLITE_NOMEM;
       }else{