diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.c | 8 | ||||
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | src/shell.c | 4 | ||||
| -rw-r--r-- | src/sqlite.h.in | 8 | ||||
| -rw-r--r-- | src/tclsqlite.c | 8 | ||||
| -rw-r--r-- | src/test1.c | 6 | ||||
| -rw-r--r-- | src/test4.c | 4 |
7 files changed, 19 insertions, 27 deletions
diff --git a/src/build.c b/src/build.c index 6600d16da..df6bb336e 100644 --- a/src/build.c +++ b/src/build.c @@ -23,7 +23,7 @@ ** ROLLBACK ** PRAGMA ** -** $Id: build.c,v 1.208 2004/06/07 10:00:31 danielk1977 Exp $ +** $Id: build.c,v 1.209 2004/06/08 00:02:33 danielk1977 Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -662,10 +662,10 @@ void sqlite3AddColumn(Parse *pParse, Token *pName){ pCol->zName = z; /* If there is no type specified, columns have the default affinity - ** 'NUMERIC'. If there is a type specified, then sqlite3AddColumnType() - ** will be called next to set pCol->affinity correctly. + ** 'NONE'. If there is a type specified, then sqlite3AddColumnType() will + ** be called next to set pCol->affinity correctly. */ - pCol->affinity = SQLITE_AFF_NUMERIC; + pCol->affinity = SQLITE_AFF_NONE; pCol->pColl = pParse->db->pDfltColl; p->nCol++; } diff --git a/src/main.c b/src/main.c index 216763195..e2fc54cda 100644 --- 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.206 2004/06/07 07:52:18 danielk1977 Exp $ +** $Id: main.c,v 1.207 2004/06/08 00:02:34 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -1041,8 +1041,7 @@ opendb_out: */ int sqlite3_open( const char *zFilename, - sqlite3 **ppDb, - const char **options + sqlite3 **ppDb ){ return openDatabase(zFilename, ppDb); } @@ -1052,8 +1051,7 @@ int sqlite3_open( */ int sqlite3_open16( const void *zFilename, - sqlite3 **ppDb, - const char **options + sqlite3 **ppDb ){ char *zFilename8; /* zFilename encoded in UTF-8 instead of UTF-16 */ int rc; diff --git a/src/shell.c b/src/shell.c index 84efe0518..181af9907 100644 --- 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.102 2004/06/05 08:04:44 danielk1977 Exp $ +** $Id: shell.c,v 1.103 2004/06/08 00:02:34 danielk1977 Exp $ */ #include <stdlib.h> #include <string.h> @@ -692,7 +692,7 @@ static void open_db(struct callback_data *p){ db = p->db = sqlite3_open_encrypted(p->zDbFilename, p->zKey, n, 0, &zErrMsg); assert(0); /* Encrypted databases are broken in SQLite 3 */ #else - sqlite3_open(p->zDbFilename, &p->db, 0); + sqlite3_open(p->zDbFilename, &p->db); db = p->db; #endif if( SQLITE_OK!=sqlite3_errcode(db) ){ diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 0b6cd99dc..5a7a809de 100644 --- 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.93 2004/06/06 09:44:04 danielk1977 Exp $ +** @(#) $Id: sqlite.h.in,v 1.94 2004/06/08 00:02:35 danielk1977 Exp $ */ #ifndef _SQLITE_H_ #define _SQLITE_H_ @@ -487,13 +487,11 @@ void *sqlite3_commit_hook(sqlite*, int(*)(void*), void*); */ int sqlite3_open( const char *filename, /* Database filename (UTF-8) */ - sqlite3 **ppDb, /* OUT: SQLite db handle */ - const char **args /* Null terminated array of option strings */ + sqlite3 **ppDb /* OUT: SQLite db handle */ ); int sqlite3_open16( const void *filename, /* Database filename (UTF-16) */ - sqlite3 **ppDb, /* OUT: SQLite db handle */ - const char **args /* Null terminated array of option strings */ + sqlite3 **ppDb /* OUT: SQLite db handle */ ); /* diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 84fbb95c9..d9c46f2d1 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -11,7 +11,7 @@ ************************************************************************* ** A TCL Interface to SQLite ** -** $Id: tclsqlite.c,v 1.79 2004/06/02 00:41:09 drh Exp $ +** $Id: tclsqlite.c,v 1.80 2004/06/08 00:02:35 danielk1977 Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ @@ -896,7 +896,6 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ const char *zArg; char *zErrMsg; const char *zFile; - const char *zOpts[2] = {0, 0}; char zBuf[80]; if( objc==2 ){ zArg = Tcl_GetStringFromObj(objv[1], 0); @@ -949,10 +948,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ #ifdef SQLITE_HAS_CODEC p->db = sqlite3_open_encrypted(zFile, pKey, nKey, 0, &zErrMsg); #else - if( objc>3 ){ - zOpts[0] = Tcl_GetString(objv[3]); - } - sqlite3_open(zFile, &p->db, zOpts); + sqlite3_open(zFile, &p->db); if( SQLITE_OK!=sqlite3_errcode(p->db) ){ zErrMsg = strdup(sqlite3_errmsg(p->db)); sqlite3_close(p->db); diff --git a/src/test1.c b/src/test1.c index 374ee03a3..77db0444f 100644 --- 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.70 2004/06/07 16:27:46 drh Exp $ +** $Id: test1.c,v 1.71 2004/06/08 00:02:35 danielk1977 Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -1300,7 +1300,7 @@ static int test_open( } zFilename = Tcl_GetString(objv[1]); - rc = sqlite3_open(zFilename, &db, 0); + rc = sqlite3_open(zFilename, &db); if( makePointerStr(interp, zBuf, db) ) return TCL_ERROR; Tcl_AppendResult(interp, zBuf, 0); @@ -1328,7 +1328,7 @@ static int test_open16( } zFilename = Tcl_GetByteArrayFromObj(objv[1], 0); - rc = sqlite3_open16(zFilename, &db, 0); + rc = sqlite3_open16(zFilename, &db); if( makePointerStr(interp, zBuf, db) ) return TCL_ERROR; Tcl_AppendResult(interp, zBuf, 0); diff --git a/src/test4.c b/src/test4.c index 856485944..84da7b3b4 100644 --- a/src/test4.c +++ b/src/test4.c @@ -11,7 +11,7 @@ ************************************************************************* ** Code for testing the the SQLite library in a multithreaded environment. ** -** $Id: test4.c,v 1.9 2004/05/31 19:34:33 drh Exp $ +** $Id: test4.c,v 1.10 2004/06/08 00:02:35 danielk1977 Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -66,7 +66,7 @@ static void *thread_main(void *pArg){ if( p->db ){ sqlite3_close(p->db); } - sqlite3_open(p->zFilename, &p->db, 0); + sqlite3_open(p->zFilename, &p->db); if( SQLITE_OK!=sqlite3_errcode(p->db) ){ p->zErr = strdup(sqlite3_errmsg(p->db)); sqlite3_close(p->db); |