Omit calls to test_get_table_printf() if SQLITE_OMIT_GET_TABLE defined. (CVS 5509)

FossilOrigin-Name: 524a4075ddaecb07469da717e8afebc91240616e

diff --git a/manifest b/manifest
index c61bc7369002f07d81c6d3e657444abfb0a4cfe6..03ccdd7b1cca5ec0ed4eafa53f7d602c7129077a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\scalls\sto\stest_destructor16()\sif\sSQLITE_OMIT_UTF16\sdefined.\s(CVS\s5508)
-D 2008-07-31T01:47:11
+C Omit\scalls\sto\stest_get_table_printf()\sif\sSQLITE_OMIT_GET_TABLE\sdefined.\s(CVS\s5509)
+D 2008-07-31T02:05:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -151,7 +151,7 @@ F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c ca61c18b6f1c632b771514e0c39a7d662c805bbf
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
 F src/tclsqlite.c ec46084184f033ba396a9ee7b5514b695083d0f3
-F src/test1.c c7d37c6d6ce5a84c45546dfafae12e5c46c656ce
+F src/test1.c e503344d492584d3df31c959f2b14da112e536f4
 F src/test2.c 7a634c1e044be3ea5845e65155fdd1cab13936cb
 F src/test3.c e00795839be38f0345a4845170426fb17d828bf9
 F src/test4.c 41056378671e7b00e6305fa9ac6fa27e6f96f406
@@ -163,7 +163,7 @@ F src/test9.c 904ebe0ed1472d6bad17a81e2ecbfc20017dc237
 F src/test_async.c da9f58f49faccd3a26ba89f58de125862351b6e2
 F src/test_autoext.c f53b0cdf7bf5f08100009572a5d65cdb540bd0ad
 F src/test_btree.c 7170e0c922ed3979f2d38f4a3f84728e5740dfc3
-F src/test_config.c 7896095e9af6e3fad0e42666880afdadfbd563ac
+F src/test_config.c 224f699a34d45eb8ac5c22a7ad6cdbb8edf0ba28
 F src/test_devsym.c 6012cb8e3acf812513511025a4fa5d626e0ba19b
 F src/test_func.c 94c4424ed9869ecf2e2132662a04581bbec016f6
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
@@ -490,7 +490,7 @@ F test/subselect.test 61267b87828155e9e67681252cfe1603641c3547
 F test/substr.test 4be572ac017143e59b4058dc75c91a0d0dc6d4e0
 F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
 F test/table.test 13b1c2e2fb4727b35ee1fb7641fc469214fd2455
-F test/tableapi.test a669ae9dd3bc8e7a6f74eff003664801667cf4c2
+F test/tableapi.test 505031f15b18a750184d967d2c896cf88fcc969c
 F test/tclsqlite.test aa1781808502271feccfd24f9e2c0d2c1d7c496a
 F test/tempdb.test b88ac8a19823cf771d742bf61eef93ef337c06b1
 F test/temptable.test 19b851b9e3e64d91e9867619b2a3f5fffee6e125
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 820c37ec5290d7f0030438da29b30c33400fd4e3
-R 3dc1fcdf110f66179a36d525136ab12f
+P 2d5cec53c2f31875d198d81ac4fd54e7066ea0ff
+R 627f2a9e4460b71645d84bbc07ff1c95
 U shane
-Z 001a364b69eb4757e0498d542e8fbb94
+Z 96460a47221ce3b47525cec7a20cc12b

diff --git a/manifest.uuid b/manifest.uuid
index 1b980291b6adfea9bcebc1e47845b9e53e9d6598..5a6c318f8a01e7d6387006e7f3e7ee91ebce8fca 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d5cec53c2f31875d198d81ac4fd54e7066ea0ff
\ No newline at end of file
+524a4075ddaecb07469da717e8afebc91240616e
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index 1062d87c669f29c4f4c60b672f9bd9c68cded992..f83d38ff2c7b616e462adf821351a662b8629259 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.316 2008/07/30 15:27:54 drh Exp $
+** $Id: test1.c,v 1.317 2008/07/31 02:05:04 shane Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -497,6 +497,8 @@ static int test_snprintf_int(
   return TCL_OK;
 }
 
+#ifndef SQLITE_OMIT_GET_TABLE
+
 /*
 ** Usage:  sqlite3_get_table_printf  DB  FORMAT  STRING  ?--no-counts?
 **
@@ -559,6 +561,8 @@ static int test_get_table_printf(
   return TCL_OK;
 }
 
+#endif /* SQLITE_OMIT_GET_TABLE */
+
 
 /*
 ** Usage:  sqlite3_last_insert_rowid DB
@@ -4529,7 +4533,9 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
      { "sqlite3_exec_printf",           (Tcl_CmdProc*)test_exec_printf      },
      { "sqlite3_exec",                  (Tcl_CmdProc*)test_exec             },
      { "sqlite3_exec_nr",               (Tcl_CmdProc*)test_exec_nr          },
+#ifndef SQLITE_OMIT_GET_TABLE
      { "sqlite3_get_table_printf",      (Tcl_CmdProc*)test_get_table_printf },
+#endif
      { "sqlite3_close",                 (Tcl_CmdProc*)sqlite_test_close     },
      { "sqlite3_create_function",       (Tcl_CmdProc*)test_create_function  },
      { "sqlite3_create_aggregate",      (Tcl_CmdProc*)test_create_aggregate },

diff --git a/src/test_config.c b/src/test_config.c
index b3007aa3f16cf67abffdb7896cf61d5ea9d9fb47..fe96b291a92f9a15fd7d3b0d392c671345c08513 100644 (file)
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -16,7 +16,7 @@
 ** The focus of this file is providing the TCL testing layer
 ** access to compile-time constants.
 **
-** $Id: test_config.c,v 1.32 2008/07/25 15:39:04 drh Exp $
+** $Id: test_config.c,v 1.33 2008/07/31 02:05:05 shane Exp $
 */
 
 #include "sqliteLimit.h"
@@ -243,6 +243,12 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "fts3", "0", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_OMIT_GET_TABLE
+  Tcl_SetVar2(interp, "sqlite_options", "gettable", "0", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "gettable", "1", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_OMIT_GLOBALRECOVER
   Tcl_SetVar2(interp, "sqlite_options", "globalrecover", "0", TCL_GLOBAL_ONLY);
 #else

diff --git a/test/tableapi.test b/test/tableapi.test
index 141b1980974a976e8221a37de4701ba61120a9c1..1437663ac9c34b5f8e448432b5adceff05ec22fb 100644 (file)
--- a/test/tableapi.test
+++ b/test/tableapi.test
@@ -12,7 +12,7 @@
 # focus of this file is testing the sqlite_exec_printf() and
 # sqlite_get_table_printf() APIs.
 #
-# $Id: tableapi.test,v 1.19 2008/07/12 14:52:20 drh Exp $
+# $Id: tableapi.test,v 1.20 2008/07/31 02:05:05 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -35,6 +35,8 @@ do_test tableapi-1.2 {
   sqlite3_exec_printf $::dbx {SELECT * FROM xyz} {}
 } {0 {a b 1 {Hi Y'all}}}
 
+ifcapable gettable {
+
 do_test tableapi-2.1 {
   sqlite3_get_table_printf $::dbx {
     BEGIN TRANSACTION;
@@ -113,6 +115,9 @@ do_test tableapi-2.7 {
   } {}
 } {0 0 0}
 
+}; # end ifcapable gettable
+
+
 # Repeat all tests with the empty_result_callbacks pragma turned on
 #
 do_test tableapi-3.1 {