Omit a couple of test cases if the library is compiled without subqueries. (CVS 2488)

FossilOrigin-Name: 6bc372978364a1a4bfa14732a818a6bba613b1e3

diff --git a/manifest b/manifest
index c5e25363c12046cfe4989925df5087d189dece21..d41a707a79a5453d19e22b7a39013c3acff7528c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\schanges\sto\shelp\sbuild\sand\stest\sSSE.\s(CVS\s2487)
-D 2005-05-27T09:41:13
+C Omit\sa\scouple\sof\stest\scases\sif\sthe\slibrary\sis\scompiled\swithout\ssubqueries.\s(CVS\s2488)
+D 2005-05-29T14:23:13
 F Makefile.in 8129e7f261d405db783676f9ca31e0841768c652
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -138,8 +138,8 @@ F test/in.test ed134f8d477a6280297ced1646de83cccf8f196d
 F test/index.test 51e01a0928b4b61228917ddd8c6c0e2466547f6f
 F test/index2.test 9ad98243fd7fe833795a9cc662f371f0eed4ff4f
 F test/index3.test 72bd07b508022db688ec536c460345d24a3912e3
-F test/insert.test 1781f8ec647ef96cadee3d0c63557fd0c16feceb
-F test/insert2.test 8d71cb249cfed3803fa77def6336ff0592caffa0
+F test/insert.test f48889e7ffb9fca18734751b47dfc53503fa8298
+F test/insert2.test 792ad079f59c7e14cf9397712725224e2112c838
 F test/insert3.test c67f0240b1c17e71fa2ed8bb6de064928f549f95
 F test/interrupt.test 170f87c2819f0e56c76e0a754949ea103d05009c
 F test/intpkey.test aaee5325eedf48b8f1e01d0d6e3f7c712908179b
@@ -281,7 +281,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 4a7f1275857602e3841ccb2d43a5c4d3d3e87bff
-R 04dd66eb49a58341bbd38031616ec847
+P 3ac4a212bd70abb94d24830c73f7121df51125c7
+R b3a0f68d8db0720c7cbbb9b80db757ce
 U danielk1977
-Z 6b2e9ec035bd8b7d47e24336173c1c39
+Z a8138bfc19beff732a86427d8d3a96ae

diff --git a/manifest.uuid b/manifest.uuid
index 134d10a35378ec8d22997c148c908fa9f53e1832..84d041dfd8def8883b1e3be7c1636ee4942efe82 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3ac4a212bd70abb94d24830c73f7121df51125c7
\ No newline at end of file
+6bc372978364a1a4bfa14732a818a6bba613b1e3
\ No newline at end of file

diff --git a/test/insert.test b/test/insert.test
index ab4e7b42a5243ba50a6e0259b5e611bef4ff9977..8b5052025f16f7cc1403c8da9c47c6ac8e1bcbfd 100644 (file)
--- a/test/insert.test
+++ b/test/insert.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the INSERT statement.
 #
-# $Id: insert.test,v 1.25 2005/03/29 03:11:00 danielk1977 Exp $
+# $Id: insert.test,v 1.26 2005/05/29 14:23:13 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -346,11 +346,13 @@ do_test insert-7.3 {
 # to see if the right-hand side of an INSERT...SELECT references the left-hand
 # side.
 #
-do_test insert-8.1 {
-  execsql {
-    INSERT INTO t3 SELECT * FROM (SELECT * FROM t3 UNION ALL SELECT 1,2,3)
-  }
-} {}
+ifcapable subquery {
+  do_test insert-8.1 {
+    execsql {
+      INSERT INTO t3 SELECT * FROM (SELECT * FROM t3 UNION ALL SELECT 1,2,3)
+    }
+  } {}
+}
 
 
 integrity_check insert-99.0

diff --git a/test/insert2.test b/test/insert2.test
index 1cb849c9ad0187db98431cec0ea3965f5fbc511d..52ee20c7db7ebc9a8ee5645497437b16558e63ce 100644 (file)
--- a/test/insert2.test
+++ b/test/insert2.test
@@ -12,7 +12,7 @@
 # focus of this file is testing the INSERT statement that takes is
 # result from a SELECT.
 #
-# $Id: insert2.test,v 1.16 2005/03/29 03:11:00 danielk1977 Exp $
+# $Id: insert2.test,v 1.17 2005/05/29 14:23:13 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -259,12 +259,14 @@ do_test insert2-5.1 {
     SELECT * FROM t2;
   }
 } {1 2 1 3}
-do_test insert2-5.2 {
-  execsql {
-    INSERT INTO t2 SELECT (SELECT a FROM t2), 4;
-    SELECT * FROM t2;
-  }
-} {1 2 1 3 1 4}
+ifcapable subquery {
+  do_test insert2-5.2 {
+    execsql {
+      INSERT INTO t2 SELECT (SELECT a FROM t2), 4;
+      SELECT * FROM t2;
+    }
+  } {1 2 1 3 1 4}
+}
 
 finish_test