diff --git a/manifest b/manifest
index b6c90dbbcd..9177d1cb2b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-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
+C Add\stest\scases\sto\sthis\sbranch.
+D 2019-08-05T20:45:53.659
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1611,7 +1611,7 @@ F test/vacuum5.test 263b144d537e92ad8e9ca8a73cc6e1583f41cfd0dda9432b87f7806174a2
 F test/vacuummem.test 7b42abb3208bd82dd23a7536588396f295a314f2
 F test/varint.test bbce22cda8fc4d135bcc2b589574be8410614e62
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
-F test/view.test 40d54c9ddf5b9fdee692bf936d3352159fe467838f92742aa1d08c7c7d1eac73
+F test/view.test f0326e787878fa6c3d7e0ecd18291fea971210dcc0420e9ff162a9d7e6a33565
 F test/vtab1.test fa6baded08fdadd6f416a9c54956c049ae327b9bdd05d25bf8163f65e65e849c
 F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082
 F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
@@ -1714,7 +1714,7 @@ F test/window7.tcl 6a1210f05d40ec89c22960213a22cd3f98d4e2f2eb20646c83c8c30d4d761
 F test/window7.test ce7f865241fdd1c5c4db869cd7bb2986c3be836bc2e73649a6846dd920f63e0f
 F test/window8.tcl 9e9a82ae9eea90a4a83481d641a812b974980c38f9247f3b89a6e3c8bed45518
 F test/window8.test df187dc19921f7be0ab709d531d681bd80ccaac96a913a89ecee8b272b91d43f
-F test/window9.test 7bbefbb188cd95d96382d4f72dc418dd3104a9c509fb5b70d91f7f78255d67da
+F test/window9.test 2bc9f311a97f1dd27de57636ebd29549fb6729c2be32f56063c0867634ed07aa
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
 F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3cc1819b
 F test/windowfault.test 403693d7d951c5473f052f7ecddb61ed15ac9d212f238b8904ea270ba90f83e5
@@ -1838,7 +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 09cd0c0c6e6c963e0039a733876e5149adb3cd10e9b92699fa1dcb0633e997a4
-R 8160d312ef65c6c22225d62347d07efe
+P 7480db307c39b86bce269583e5917f5e1a3990500552fd98400ef3e7088c0b2a
+R b1f7472fc9b174cc74ba9e00e5ff64d4
 U dan
-Z 1b28e450eef7b9a84f216281fe844a90
+Z ae9b0a58941d32ddda7f9190b5bf51cf
diff --git a/manifest.uuid b/manifest.uuid
index 4ad83f9063..87cbd8da92 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7480db307c39b86bce269583e5917f5e1a3990500552fd98400ef3e7088c0b2a
\ No newline at end of file
+f37317d81cc2864ed57c76a7347351310d61c8056a2a0179218530ba60a44986
\ No newline at end of file
diff --git a/test/view.test b/test/view.test
index 8a60f86215..4f2402169a 100644
--- a/test/view.test
+++ b/test/view.test
@@ -724,4 +724,41 @@ do_execsql_test view-26.1 {
   1 1 3 3
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test view-27.0 {
+  CREATE TABLE t0(c0 TEXT, c1);
+  INSERT INTO t0(c0, c1) VALUES (-1, 0);
+  CREATE VIEW v0(c0, c1) AS SELECT t0.c0, AVG(t0.c1) FROM t0;
+}
+
+do_execsql_test view-27.1 {
+  SELECT c0, typeof(c0), affinity(c0), c1, typeof(c1), affinity(c1) FROM v0;
+} {
+  -1   text text
+   0.0 real none
+}
+
+do_execsql_test view-27.2 { SELECT c0<c1 FROM v0 } 1
+do_execsql_test view-27.3 { SELECT c1<c0 FROM v0 } 0
+do_execsql_test view-27.4 {
+  SELECT 1 FROM v0 WHERE c1<c0
+} {}
+do_execsql_test view-27.5 {
+  SELECT 1 FROM v0 WHERE c0<c1
+} {1}
+
+do_execsql_test view-27.6 { 
+  SELECT c0<c1 FROM (SELECT t0.c0 AS c0, AVG(t0.c1) AS c1 FROM t0) 
+} 1
+do_execsql_test view-27.7 { 
+  SELECT c1<c0 FROM (SELECT t0.c0 AS c0, AVG(t0.c1) AS c1 FROM t0) 
+} 0
+do_execsql_test view-27.8 {
+  SELECT 1 FROM (SELECT t0.c0 AS c0, AVG(t0.c1) AS c1 FROM t0) WHERE c1<c0
+} {}
+do_execsql_test view-27.9 {
+  SELECT 1 FROM (SELECT t0.c0 AS c0, AVG(t0.c1) AS c1 FROM t0) WHERE c0<c1
+} {1}
+
 finish_test
diff --git a/test/window9.test b/test/window9.test
index 748c412f8e..65834ed89b 100644
--- a/test/window9.test
+++ b/test/window9.test
@@ -131,6 +131,21 @@ do_catchsql_test 3.4 {
       );
 } {1 {sub-select returns 3 columns - expected 1}}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 4.0 {
+  CREATE TABLE t1(a, b TEXT);
+  INSERT INTO t1 VALUES('A', 1), ('A', 2), ('2', 1), ('2', 2);
+}
+
+do_execsql_test 4.1.1 {
+  SELECT b, b=count(*), '1,2'                   FROM t1 GROUP BY b;
+} {1 0 1,2 2 1 1,2}
+do_execsql_test 4.1.2 {
+  SELECT b, b=count(*), group_concat(b) OVER () FROM t1 GROUP BY b;
+} {1 0 1,2 2 1 1,2}
+
+
 
 finish_test