Remove the experimental sqlite_open_aux_file() API. It will soon be replaced

by ATTACH and DETACH SQL commands. (CVS 889)

FossilOrigin-Name: b6d6e07f3a5cb493f2cf0675bc6061c5afe5c078

diff --git a/manifest b/manifest
index d19a4559c0ef8eb4101cd8370943ee6ec75b0d84..84dd635d4f01ae864b63f5cbdf3ad05efc9e503e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sobsolete\sdocumentation\son\show\sto\scrosscompile\sversion\s1.0\sof\nSQLite.\s(CVS\s888)
-D 2003-03-30T18:58:58
+C Remove\sthe\sexperimental\ssqlite_open_aux_file()\sAPI.\s\sIt\swill\ssoon\sbe\sreplaced\nby\sATTACH\sand\sDETACH\sSQL\scommands.\s(CVS\s889)
+D 2003-03-30T19:17:02
 F Makefile.in 3c4ba24253e61c954d67adbbb4245e7117c5357e
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -30,7 +30,7 @@ F src/func.c 882c3ed5a02be18cd904715c7ec62947a34a3605
 F src/hash.c 4fc39feb7b7711f6495ee9f2159559bedb043e1f
 F src/hash.h cd0433998bc1a3759d244e1637fe5a3c13b53bf8
 F src/insert.c 95e7ab3fb51909351273a6c6f8aa831201130ce7
-F src/main.c e0d9a86541f0644be5c875c6d8f5062c325c653d
+F src/main.c df729d604e3055b8081e3d4348983dfd30d2835d
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c dfed46091f69cd2d1e601f8a214d41344f2b00b6
 F src/os.h aa52f0c9da321ff6134d19f2ca959e18e33615d0
@@ -40,12 +40,12 @@ F src/parse.y 243cfc277d0e5ce87086c015e717dec98d6648a7
 F src/printf.c fc5fdef6e92ad205005263661fe9716f55a49f3e
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c afdc06d4606d14ab5793ef480206def6b02a2f19
-F src/shell.c 0d260a007e0668fc7dda2b0c89bd597ef2966ec6
+F src/shell.c c13ff46e905a59eb1c7dbea7c1850f8f115e6395
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
-F src/sqlite.h.in 6f648803f2ffb9beb35cb1cfa42b323d55519171
+F src/sqlite.h.in 91f94c73514477ffef54aaa452f7fcb62fc59d1e
 F src/sqliteInt.h 5335f694cba9f07538cf8207aab11d48e0b9a2f8
 F src/table.c eed2098c9b577aa17f8abe89313a9c4413f57d63
-F src/tclsqlite.c 8167d40fd34036701e07492d07a6f9e5c4015241
+F src/tclsqlite.c 4cb0ffa863123ae037db359849a231ff5cebfed4
 F src/test1.c 7ad4e6308dde0bf5a0f0775ce20cb2ec37a328f8
 F src/test2.c 5014337d8576b731cce5b5a14bec4f0daf432700
 F src/test3.c c12ea7f1c3fbbd58904e81e6cb10ad424e6fc728
@@ -106,7 +106,7 @@ F test/sort.test 61a729023ae4ac3be9b225dc0be026fb43fec4e6
 F test/subselect.test f0fea8cf9f386d416d64d152e3c65f9116d0f50f
 F test/table.test 371a1fc1c470982b2f68f9732f903a5d96f949c4
 F test/tableapi.test 3c80421a889e1d106df16e5800fa787f0d2914a6
-F test/tclsqlite.test f650195b8124aca24bee175393a1ed2e5a544a38
+F test/tclsqlite.test 4a69bd223eb18f8cdc58a9ca193881121fa7a8d2
 F test/temptable.test 6feff1960c707e924d5462356c5303943dac4a8e
 F test/tester.tcl d7a5835edaf118539241145d8188f0822b673488
 F test/trans.test 75e7a171b5d2d94ee56766459113e2ad0e5f809d
@@ -155,7 +155,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 66c80ae232a78ecb010280ab1aa684cb78b0662f
-R 208f37d602235a28fca3e23d11ba2cbf
+P ac0622bf5fca9c8907319a20158e991efdaa6402
+R 359232b433a24865017ceb4c15ffe33b
 U drh
-Z 125b0a7be77e859c6623ad865623b75e
+Z 34c4d8547949ea6d733267131feeb146

diff --git a/manifest.uuid b/manifest.uuid
index 9e80a712d327a5c4334f5151c0ebde7924e172b3..ebd51f2a907129839adeb437d370825b59f6cb93 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ac0622bf5fca9c8907319a20158e991efdaa6402
\ No newline at end of file
+b6d6e07f3a5cb493f2cf0675bc6061c5afe5c078
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 161bb454f3256cc36953da850734c86f2c1d3a19..ee1985fc22014312d38c89a991538ac395ffe4ff 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.117 2003/03/27 12:51:25 drh Exp $
+** $Id: main.c,v 1.118 2003/03/30 19:17:02 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -974,44 +974,3 @@ void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){
   return 0;
 #endif
 }
-
-
-/*
-** Attempt to open the file named in the argument as the auxiliary database
-** file.  The auxiliary database file is used to store TEMP tables.  But
-** by using this API, it is possible to trick SQLite into opening two
-** separate databases and acting on them as if they were one.
-**
-** This routine closes the existing auxiliary database file, which will
-** cause any previously created TEMP tables to be dropped.
-**
-** The zName parameter can be a NULL pointer or an empty string to cause
-** a temporary file to be opened and automatically deleted when closed.
-*/
-int sqlite_open_aux_file(sqlite *db, const char *zName, char **pzErrMsg){
-  int rc;
-  if( zName && zName[0]==0 ) zName = 0;
-  if( sqliteSafetyOn(db) ) goto openaux_misuse;
-  sqliteResetInternalSchema(db);
-  if( db->aDb[1].pBt!=0 ){
-    sqliteBtreeClose(db->aDb[1].pBt);
-  }
-  rc = sqliteBtreeOpen(zName, 0, MAX_PAGES, &db->aDb[1].pBt);
-  if( rc ){
-    if( zName==0 ) zName = "a temporary file";
-    sqliteSetString(pzErrMsg, "unable to open ", zName, 
-      ": ", sqlite_error_string(rc), 0);
-    sqliteStrRealloc(pzErrMsg);
-    sqliteSafetyOff(db);
-    return rc;
-  }
-  rc = sqliteInit(db, pzErrMsg);
-  if( sqliteSafetyOff(db) ) goto openaux_misuse;
-  sqliteStrRealloc(pzErrMsg);
-  return rc;
-
-openaux_misuse:
-  sqliteSetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), 0);
-  sqliteStrRealloc(pzErrMsg);
-  return SQLITE_MISUSE;
-}

diff --git a/src/shell.c b/src/shell.c
index 7e93dca5a6723167859ed7a30bd04c83f4c25d60..180f294ea1f290d12581c7851541a0f8cf40bcc1 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.66 2003/02/05 14:06:20 drh Exp $
+** $Id: shell.c,v 1.67 2003/03/30 19:17:03 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -495,7 +495,6 @@ static char zHelp[] =
   "                       \"insert\", \"list\", or \"html\"\n"
   ".mode insert TABLE     Generate SQL insert statements for TABLE\n"
   ".nullvalue STRING      Print STRING instead of nothing for NULL data\n"
-  ".openaux FILENAME      Use FILENAME to hold TEMP tables\n"
   ".output FILENAME       Send output to FILENAME\n"
   ".output stdout         Send output to the screen\n"
   ".prompt MAIN CONTINUE  Replace the standard prompts\n"
@@ -710,15 +709,6 @@ static int do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
     sprintf(p->nullvalue, "%.*s", (int)ArraySize(p->nullvalue)-1, azArg[1]);
   }else
 
-  if( c=='o' && strncmp(azArg[0], "openaux", n)==0 ){
-    char *zErrMsg = 0;
-    sqlite_open_aux_file(db, nArg>=2 ? azArg[1] : 0, &zErrMsg);
-    if( zErrMsg ){
-      fprintf(stderr,"Error: %s\n", zErrMsg);
-      free(zErrMsg);
-    }
-  }else
-
   if( c=='o' && strncmp(azArg[0], "output", n)==0 && nArg==2 ){
     if( p->out!=stdout ){
       fclose(p->out);

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 15904533310f098137ff538e8adfdc18a5073548..552f351b40d6a07adbe02bbb8a66ef3e4aa8bf81 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.41 2003/01/29 14:06:09 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.42 2003/03/30 19:17:03 drh Exp $
 */
 #ifndef _SQLITE_H_
 #define _SQLITE_H_
@@ -675,16 +675,6 @@ int sqlite_step(
 */
 int sqlite_finalize(sqlite_vm*, char **pzErrMsg);
 
-/*
-** Attempt to open the file named in the argument as the auxiliary database
-** file.  The auxiliary database file is used to store TEMP tables.  But
-** by using this API, it is possible to trick SQLite into opening two
-** separate databases and acting on them as if they were one.
-**
-****** THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE. ******
-*/
-int sqlite_open_aux_file(sqlite *db, const char *zName, char **pzErrMsg);
-
 #ifdef __cplusplus
 }  /* End of the 'extern "C"' block */
 #endif

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index bddcbb267b401ed882e174055dc7b7e87c4347e8..69f70bd416039966e0d178377142e579c3755a4c 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.44 2003/01/31 17:21:50 drh Exp $
+** $Id: tclsqlite.c,v 1.45 2003/03/30 19:17:03 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -330,14 +330,13 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
   static const char *DB_strs[] = {
     "busy",               "changes",           "close",
     "complete",           "errorcode",         "eval",
-    "function",           "last_insert_rowid", "open_aux_file",
-    "timeout",            0                    
+    "function",           "last_insert_rowid", "timeout",
+    0                    
   };
   enum DB_enum {
     DB_BUSY,              DB_CHANGES,          DB_CLOSE,
     DB_COMPLETE,          DB_ERRORCODE,        DB_EVAL,
-    DB_FUNCTION,          DB_LAST_INSERT_ROWID,DB_OPEN_AUX_FILE,
-    DB_TIMEOUT,          
+    DB_FUNCTION,          DB_LAST_INSERT_ROWID,DB_TIMEOUT,          
   };
 
   if( objc<2 ){
@@ -569,35 +568,6 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
     break;
   }
 
-  /*
-  **     $db open_aux_file  FILENAME
-  **
-  ** Begin using FILENAME as the database file used to store temporary
-  ** tables.
-  */
-  case DB_OPEN_AUX_FILE: {
-    const char *zFilename;
-    char *zErrMsg = 0;
-    int rc;
-    if( objc!=3 ){
-      Tcl_WrongNumArgs(interp, 2, objv, "FILENAME");
-      return TCL_ERROR;
-    }
-    zFilename = Tcl_GetStringFromObj(objv[2], 0);
-    rc = sqlite_open_aux_file(pDb->db, zFilename, &zErrMsg);
-    pDb->rc = rc;
-    if( rc!=0 ){
-      if( zErrMsg ){
-        Tcl_AppendResult(interp, zErrMsg, 0);
-        free(zErrMsg);
-      }else{
-        Tcl_AppendResult(interp, sqlite_error_string(rc), 0);
-      }
-      return TCL_ERROR;
-    }
-    break;
-  }
-
   /*
   **     $db timeout MILLESECONDS
   **

diff --git a/test/tclsqlite.test b/test/tclsqlite.test
index 8ffc8243da2aa969071162773221ad5e049230f0..cca0abb15c1eda6a469eb936dd70e780de76b266 100644 (file)
--- a/test/tclsqlite.test
+++ b/test/tclsqlite.test
@@ -15,7 +15,7 @@
 # interface is pretty well tested.  This file contains some addition
 # tests for fringe issues that the main test suite does not cover.
 #
-# $Id: tclsqlite.test,v 1.9 2003/01/31 17:21:51 drh Exp $
+# $Id: tclsqlite.test,v 1.10 2003/03/30 19:17:03 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -29,7 +29,7 @@ do_test tcl-1.1 {
 do_test tcl-1.2 {
   set v [catch {db bogus} msg]
   lappend v $msg
-} {1 {bad option "bogus": must be busy, changes, close, complete, errorcode, eval, function, last_insert_rowid, open_aux_file, or timeout}}
+} {1 {bad option "bogus": must be busy, changes, close, complete, errorcode, eval, function, last_insert_rowid, or timeout}}
 do_test tcl-1.3 {
   execsql {CREATE TABLE t1(a int, b int)}
   execsql {INSERT INTO t1 VALUES(10,20)}