From: danielk1977 <danielk1977@noemail.net>
Date: Sat, 29 Jan 2005 01:54:18 +0000 (+0000)
Subject: Modification to schema.test so that it works with SQLITE_OMIT_TRIGGER and SQLITE_OMIT... 
X-Git-Tag: version-3.6.10~3867
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9ec413a085648c6d4ee6fb9b582989d11129041;p=thirdparty%2Fsqlite.git

Modification to schema.test so that it works with SQLITE_OMIT_TRIGGER and SQLITE_OMIT_UTF16 defined. (CVS 2285)

FossilOrigin-Name: 95ecb2745f3fc69d370fc3961800db56297acb68
---

diff --git a/manifest b/manifest
index ec42fef8d3..f3c9ed8a94 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\s#include\sof\s"sqliteInt.h"\salways\scomes\sfirst\sin\sC\ssource\sfiles.\s(CVS\s2284)
-D 2005-01-28T01:29:08
+C Modification\sto\sschema.test\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_TRIGGER\sand\sSQLITE_OMIT_UTF16\sdefined.\s(CVS\s2285)
+D 2005-01-29T01:54:18
 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -174,7 +174,7 @@ F test/reindex.test 38b138abe36bf9a08c791ed44d9f76cd6b97b78b
 F test/rollback.test 94cd981ee3a627d9f6466f69dcf1f7dbfe695d7a
 F test/rowid.test 040a3bef06f970c45f5fcd14b2355f7f4d62f0cf
 F test/safety.test 907b64fee719554a3622853812af3886fddbbb4f
-F test/schema.test 3787768619706fc6f47c53cbe23472e782302e1e
+F test/schema.test 21cbe7dac652f6d7eb058f3dec369bdbf46bbde6
 F test/select1.test ad700a2a1c325a23a7206ad4d189e33917de526f
 F test/select2.test 01b9cbc06e5ed662ce0289aa5f47314d54541e82
 F test/select3.test 9de435aa84fc406708cd8dc1b1d60e7f27cea685
@@ -272,7 +272,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P dc1b8106c4ce0ab378ee26324df4537ffe68a940
-R 0f59dcbabaf209eff6e73098be3a8682
-U drh
-Z 53c0e4d0713e8aee932500cd93118fec
+P 522c094f799220468780acb77731edb715bf5e3c
+R 9002e89543be697066b39cd89912bc24
+U danielk1977
+Z e3ae9b709b41b90ac9746a34ed6aa9ba
diff --git a/manifest.uuid b/manifest.uuid
index 67eb867871..0e3d6f6784 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-522c094f799220468780acb77731edb715bf5e3c
\ No newline at end of file
+95ecb2745f3fc69d370fc3961800db56297acb68
\ No newline at end of file
diff --git a/test/schema.test b/test/schema.test
index 262fc4bf5a..76783b5102 100644
--- a/test/schema.test
+++ b/test/schema.test
@@ -13,7 +13,7 @@
 # This file tests the various conditions under which an SQLITE_SCHEMA
 # error should be returned.
 #
-# $Id: schema.test,v 1.3 2005/01/25 04:27:55 danielk1977 Exp $
+# $Id: schema.test,v 1.4 2005/01/29 01:54:18 danielk1977 Exp $
 
 #---------------------------------------------------------------------
 # When any of the following types of SQL statements or actions are 
@@ -116,6 +116,9 @@ ifcapable trigger {
 }
 
 do_test schema-4.1 {
+  catchsql {
+    CREATE TABLE abc(a, b, c);
+  }
   set ::STMT [sqlite3_prepare $::DB {SELECT * FROM sqlite_master} -1 TAIL]
   execsql {
     CREATE INDEX abc_index ON abc(a);
@@ -185,22 +188,24 @@ do_test schema-6.4 {
 # Tests 7.* check that prepared statements are invalidated when
 # a collation sequence is deleted (but not when one is added).
 #
-do_test schema-7.1 {
-  set sql {SELECT * FROM abc;}
-  set ::STMT [sqlite3_prepare $::DB $sql -1 TAIL]
-  add_test_collate $::DB 1 1 1
-  sqlite3_step $::STMT
-} {SQLITE_DONE}
-do_test schema-7.2 {
-  sqlite3_reset $::STMT
-} {SQLITE_OK}
-do_test schema-7.3 {
-  add_test_collate $::DB 0 0 0 
-  sqlite3_step $::STMT
-} {SQLITE_ERROR}
-do_test schema-7.4 {
-  sqlite3_finalize $::STMT
-} {SQLITE_SCHEMA}
+ifcapable utf16 {
+  do_test schema-7.1 {
+    set sql {SELECT * FROM abc;}
+    set ::STMT [sqlite3_prepare $::DB $sql -1 TAIL]
+    add_test_collate $::DB 1 1 1
+    sqlite3_step $::STMT
+  } {SQLITE_DONE}
+  do_test schema-7.2 {
+    sqlite3_reset $::STMT
+  } {SQLITE_OK}
+  do_test schema-7.3 {
+    add_test_collate $::DB 0 0 0 
+    sqlite3_step $::STMT
+  } {SQLITE_ERROR}
+  do_test schema-7.4 {
+    sqlite3_finalize $::STMT
+  } {SQLITE_SCHEMA}
+}
 
 #---------------------------------------------------------------------
 # Tests 8.1 and 8.2 check that prepared statements are invalidated when