Fix a couple of extra test-suite problems with SQLITE_OMIT_VIEW. (CVS 2139)

FossilOrigin-Name: 894c142d115b31506b6b8212e1b850ea28c4ca11

diff --git a/manifest b/manifest
index c754466249d573ab66b1e1e6865266ee84c8c729..bd42f20e4e2933c4d4a74524803fcc96b9896e0a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\stests\spass\swhen\sSQLITE_OMIT_COMPOUND_SELECT\sis\sdefined.\s(CVS\s2138)
-D 2004-11-22T13:35:41
+C Fix\sa\scouple\sof\sextra\stest-suite\sproblems\swith\sSQLITE_OMIT_VIEW.\s(CVS\s2139)
+D 2004-11-22T15:05:59
 F Makefile.in 8291610f5839939a5fbff4dbbf85adb0fe1ac37f
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -148,7 +148,7 @@ F test/memdb.test 532aac7128a3da494cddc4461d76c6e3988f771b
 F test/memleak.test f1fa233f8295dd1d955a00d5e5ee857850f27f29
 F test/minmax.test e7048476940df0af11d0f2cf687572f557cd0b29
 F test/misc1.test 744f60d1025fa978708b96cb222a07a1feb1524a
-F test/misc2.test a655f2453d8b96fedca93b70fab6719cb4e99faa
+F test/misc2.test bc852f1622d98b610d1f3e2ceb36ed7271256050
 F test/misc3.test 928a2f1e1189924ed14e1ae074e34f40688bdf94
 F test/misc4.test c683ab8182172474c804b346f8a39ca786322250
 F test/misuse.test 2d7c46160f7c214f761fc5d030684a37ae8832a6
@@ -171,7 +171,7 @@ F test/select2.test 91a2225926039b0d1687840735c284dbbf89f0bc
 F test/select3.test 9de435aa84fc406708cd8dc1b1d60e7f27cea685
 F test/select4.test 1ae6f2bd6177d4428df8644eb95d09f4568fb149
 F test/select5.test 94db800bbeff2e426c0175e07f7a71d4617853b5
-F test/select6.test fe1c2bfb6921f26468424709bd1427122fb4d494
+F test/select6.test c00d300d90f0ae3fa4e4f4336c71b2345bfa819c
 F test/select7.test b952604c22a5644a065e9e99dc904b5a65565f07
 F test/sort.test 87882e6c72a75d45e98a1c802c1ded0eac557d85
 F test/subselect.test ff3850d0aab1443dafa4ecbdab1d01e58e7b366d
@@ -259,7 +259,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 53894988ac1ad44ec65a1e1c420e2a26eb4c2efd
-R ae883046a665a42e48d31753b3268782
+P 007be591b7829f9ff38e4b14ba5a5043796c2ff3
+R 1c97dc6e7d25c4381776d03b54293b3e
 U danielk1977
-Z a08446cec18a32e6982c35ed9dfce9a2
+Z b013ca9ef6a11eef0f25e62a5e497296

diff --git a/manifest.uuid b/manifest.uuid
index 595e47d8b82cd8f324f55e434a285f821f35b851..b861aa9a0b439aee5814279700ca8b4383a22811 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-007be591b7829f9ff38e4b14ba5a5043796c2ff3
\ No newline at end of file
+894c142d115b31506b6b8212e1b850ea28c4ca11
\ No newline at end of file

diff --git a/test/misc2.test b/test/misc2.test
index 4df15c1726cccf99bbcfb95d212bde2ccf6e36c6..ae503f78546b48528229cf7ee90a0bf956dc4864 100644 (file)
--- a/test/misc2.test
+++ b/test/misc2.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc2.test,v 1.17 2004/11/22 13:35:42 danielk1977 Exp $
+# $Id: misc2.test,v 1.18 2004/11/22 15:05:59 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -40,17 +40,21 @@ do_test misc2-1.2 {
 
 # Make sure ROWID works on a view and a subquery.  Ticket #364
 #
-ifcapable view {
 do_test misc2-2.1 {
   execsql {
     CREATE TABLE t1(a,b,c);
     INSERT INTO t1 VALUES(1,2,3);
     CREATE TABLE t2(a,b,c);
     INSERT INTO t2 VALUES(7,8,9);
+  }
+} {}
+ifcapable view {
+do_test misc2-2.2 {
+  execsql {
     SELECT rowid, * FROM (SELECT * FROM t1, t2);
   }
 } {{} 1 2 3 7 8 9}
-do_test misc2-2.2 {
+do_test misc2-2.3 {
   execsql {
     CREATE VIEW v1 AS SELECT * FROM t1, t2;
     SELECT rowid, * FROM v1;

diff --git a/test/select6.test b/test/select6.test
index d07a2c189d933b68560977baa5bc88813afef3cc..0a422c9de48bdd833a268631264b911024a6649a 100644 (file)
--- a/test/select6.test
+++ b/test/select6.test
@@ -12,7 +12,7 @@
 # focus of this file is testing SELECT statements that contain
 # subqueries in their FROM clause.
 #
-# $Id: select6.test,v 1.14 2004/11/22 13:35:42 danielk1977 Exp $
+# $Id: select6.test,v 1.15 2004/11/22 15:05:59 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -402,6 +402,9 @@ do_test select6-8.2 {
     WHERE  y=p
   }
 } {1 1 11 111 2 2 22 222 2 2 22 222}
+# If view support is omitted from the build, then so is the query 
+# "flattener". So omit this test and test select6-8.6 in that case.
+ifcapable view {
 do_test select6-8.3 {
   is_flat {
     SELECT y, p, q, r FROM
@@ -410,6 +413,7 @@ do_test select6-8.3 {
     WHERE  y=p
   }
 } {1}
+} ;# ifcapable view
 do_test select6-8.4 {
   execsql {
     SELECT DISTINCT y, p, q, r FROM
@@ -429,6 +433,7 @@ do_test select6-8.5 {
     WHERE e.r=f.z
   }
 } {1 1 11 111 111}
+ifcapable view {
 do_test select6-8.6 {
   is_flat {
     SELECT * FROM 
@@ -440,6 +445,7 @@ do_test select6-8.6 {
     WHERE e.r=f.z
   }
 } {1}
+} ;# ifcapable view
 
 
 finish_test