Fixes so that builds work with SQLITE_OMIT_VIRTUALTABLE=1. (CVS 3216)

FossilOrigin-Name: 54b30fe1bdf0c9e690e12f07dcce4382e863bf02

diff --git a/manifest b/manifest
index 742c2d6a57182e29078cb462a3f5bc5eb211fa01..6af0e70f34d537ecea7ae8833f8e90eec834cc22 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\sbuilds\sworking\sagain\swhen\sextension\sloading\sis\snot\senabled.\s\sTicket\s#1839.\s(CVS\s3215)
-D 2006-06-12T12:46:21
+C Fixes\sso\sthat\sbuilds\swork\swith\sSQLITE_OMIT_VIRTUALTABLE=1.\s(CVS\s3216)
+D 2006-06-12T12:50:23
 F Makefile.in 56fd6261e83f60724e6dcd764e06ab68cbd53909
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -84,7 +84,7 @@ F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
 F src/test5.c 7162f8526affb771c4ed256826eee7bb9eca265f
 F src/test6.c 60a02961ceb7b3edc25f5dc5c1ac2556622a76de
 F src/test7.c 03fa8d787f6aebc6d1f72504d52f33013ad2c8e3
-F src/test8.c d25e2c7be5e5bbc8c3343fec186e0c95255beb74
+F src/test8.c 9bfd5b76f7694d4bc8318bf73d7bc1b607b49886
 F src/test_async.c e3deaedd4d86a56391b81808fde9e44fbd92f1d3
 F src/test_md5.c 6c42bc0a3c0b54be34623ff77a0eec32b2fa96e3
 F src/test_server.c a6460daed0b92ecbc2531b6dc73717470e7a648c
@@ -287,7 +287,7 @@ F test/vacuum.test 37f998b841cb335397c26d9bbc3457182af2565f
 F test/vacuum2.test 5aea8c88a65cb29f7d175296e7c819c6158d838c
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/view.test 16e2774fe35e47a07ac4471b7f0bcc948b1aa6d5
-F test/vtab1.test abc34e3ac745871be2ff77adb8f37f7868cee4a8
+F test/vtab1.test 79369c49f7607300ce62cf8b10ea56eb604f106f
 F test/where.test ee7c9a6659b07e1ee61177f6e7ff71565ee2c9df
 F test/where2.test a16476a5913e75cf65b38f2daa6157a6b7791394
 F test/where3.test 3b5ad2c58069e12be2bd86bc5e211a82810521aa
@@ -363,7 +363,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P b63dbc794795533f0bfd2d8e25633e6e3dea3ebd
-R 8640a1358a94d506d522af6b1245f46b
+P 89ead80129ec934d2cb5f2447598a7253172f704
+R d19fd823944ee45b941b2a4308dc64bb
 U drh
-Z db019b0aec14966db17c4b9da5cd37eb
+Z a3f2f6fbf2203daf548b4cc344da9855

diff --git a/manifest.uuid b/manifest.uuid
index 8106d5c05feddc3da219b7372f2a712f2e242a34..bdcd84a2a613dda85e4ebb30f6c61f61f15655cd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-89ead80129ec934d2cb5f2447598a7253172f704
\ No newline at end of file
+54b30fe1bdf0c9e690e12f07dcce4382e863bf02
\ No newline at end of file

diff --git a/src/test8.c b/src/test8.c
index c55f5ccaa13b264ba50c352e0799a8c7b23fccb5..a444bf1b8bb5c715300f1e30ef6dcd7dc19c9972 100644 (file)
--- a/src/test8.c
+++ b/src/test8.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test8.c,v 1.4 2006/06/12 12:08:45 danielk1977 Exp $
+** $Id: test8.c,v 1.5 2006/06/12 12:50:23 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -63,7 +63,9 @@ static int echoDeclareVtab(sqlite3 *db, int argc, char **argv){
     sqlite3_bind_text(pStmt, 1, argv[1], -1, 0);
     if( sqlite3_step(pStmt)==SQLITE_ROW ){
       const char *zCreateTable = sqlite3_column_text(pStmt, 0);
+#ifndef SQLITE_OMIT_VIRTUALTABLE
       sqlite3_declare_vtab(db, zCreateTable);
+#endif
     } else {
       rc = SQLITE_ERROR;
     }

diff --git a/test/vtab1.test b/test/vtab1.test
index 31f6ea8233447a88f671282cd619ce869968e53c..fc7de6b491b71f8600838486fff6a4555bc6e491 100644 (file)
--- a/test/vtab1.test
+++ b/test/vtab1.test
@@ -11,11 +11,16 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is creating and dropping virtual tables.
 #
-# $Id: vtab1.test,v 1.4 2006/06/12 12:08:45 danielk1977 Exp $
+# $Id: vtab1.test,v 1.5 2006/06/12 12:50:23 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !vtab {
+  finish_test
+  return
+}
+
 # We cannot create a virtual table if the module has not
 # been registered.
 #
@@ -95,4 +100,3 @@ do_test vtab1-2.4 {
 ]
 
 finish_test
-