mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the TCL interface so that it does not use unpublished interfaces. (CVS 4965)

Browse Source 
FossilOrigin-Name: 046a98a8c88be7389c1571a819ccf1907a3f7217
This commit is contained in:
drh 2008-04-04 12:21:08 +00:00
parent d094db1c7b
commit bd4d397ca9
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Remove\ssuperfluous\scode\sfrom\sbtree.c.\s(CVS\s4964)
D 2008-04-03T21:46:57
C Fix\sthe\sTCL\sinterface\sso\sthat\sit\sdoes\snot\suse\sunpublished\sinterfaces.\s(CVS\s4965)
D 2008-04-04T12:21:09
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -143,7 +143,7 @@ F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3
F src/sqliteInt.h cfe0b6c4b1a9b4be22f856ca8058ccd1bf0e41a8
F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
F src/table.c 2c48c575dd59b3a6c5c306bc55f51a9402cf429a
F src/tclsqlite.c 1367762764772a233643524c3585b4711a9adcda
F src/tclsqlite.c d272cbd208f87712f67ae7462d2d6cffbb28a676
F src/test1.c 318bed2bfc24b9f454af09c408ffe4a94d03b9e9
F src/test2.c f0808cc643528b9620e4059ca9bda8346f526121
F src/test3.c c715b5a8a6415d7b2c67f97c394eef488b6f7e63
@ -625,7 +625,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 040cffe2727936ce9228666fce5b00db47493e7d
R b5169b7863cd504077cbda35abe0563a
P 40173010706fb52ecd60197ce6e97d51a1899267
R 38203f7b1cba84ebf35aac6b8851c7e3
U drh
Z 7be2f0423e0cd7f7d3a718451f5f8fd0
Z 5b48f2f47a356e78b4cf2a247abc108d

2
manifest.uuid
View File

@ -1 +1 @@
40173010706fb52ecd60197ce6e97d51a1899267
046a98a8c88be7389c1571a819ccf1907a3f7217

12
src/tclsqlite.c
View File

@ -12,7 +12,7 @@
** A TCL Interface to SQLite. Append this file to sqlite3.c and
** compile the whole thing to build a TCL-enabled version of SQLite.
**
** $Id: tclsqlite.c,v 1.212 2008/03/25 16:16:29 danielk1977 Exp $
** $Id: tclsqlite.c,v 1.213 2008/04/04 12:21:09 drh Exp $
*/
#include "tcl.h"
#include <errno.h>
@ -1340,11 +1340,11 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
Tcl_AppendResult(interp,"Error: non-null separator required for copy",0);
return TCL_ERROR;
}
if(sqlite3StrICmp(zConflict, "rollback") != 0 &&
sqlite3StrICmp(zConflict, "abort" ) != 0 &&
sqlite3StrICmp(zConflict, "fail" ) != 0 &&
sqlite3StrICmp(zConflict, "ignore" ) != 0 &&
sqlite3StrICmp(zConflict, "replace" ) != 0 ) {
if(strcasecmp(zConflict, "rollback") != 0 &&
strcasecmp(zConflict, "abort" ) != 0 &&
strcasecmp(zConflict, "fail" ) != 0 &&
strcasecmp(zConflict, "ignore" ) != 0 &&
strcasecmp(zConflict, "replace" ) != 0 ) {
Tcl_AppendResult(interp, "Error: \"", zConflict,
"\", conflict-algorithm must be one of: rollback, "
"abort, fail, ignore, or replace", 0);