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

Fix the TCL installer so that it omits the release number. Ticket #3396.

Browse Source 
Use strcmp() instead of sqlite3StrICmp() in the "copy" method of the SQLite
object in the TCL interface. (CVS 5735)

FossilOrigin-Name: a88606245760eaf8054d67773db7d8b795e8ca25
This commit is contained in:
drh 2008-09-23 10:12:13 +00:00
parent e2c3a659a9
commit 3e59c01255
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -747,7 +747,7 @@ install: sqlite3$(BEXE) libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
tcl_install: libtclsqlite3.la
$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(VERSION)
$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(RELEASE)
clean:
rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la

14
manifest
View File

@ -1,7 +1,7 @@
C Add\sno-op\sUnload\sentry\spoints\sto\sthe\sTCL\sinterface.\s\sTicket\s#3397.\s(CVS\s5734)
D 2008-09-23T09:58:47
C Fix\sthe\sTCL\sinstaller\sso\sthat\sit\somits\sthe\srelease\snumber.\s\sTicket\s#3396.\nUse\sstrcmp()\sinstead\sof\ssqlite3StrICmp()\sin\sthe\s"copy"\smethod\sof\sthe\sSQLite\nobject\sin\sthe\sTCL\sinterface.\s(CVS\s5735)
D 2008-09-23T10:12:14
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in d15a7ebfe5e057a72a49805ffb302dbb601c8329
F Makefile.in e4ab842f9a64ef61d57093539a8aab76b12810db
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
F VERSION 708c93c5dbb97b8a8e4c39eb77c53dae43d96910
@ -155,7 +155,7 @@ F src/sqliteInt.h dbe2797806c48f4a90adfea69dfbea95edd722ae
F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
F src/tclsqlite.c 41b968e1bf03a945ca01e29b566e175ca43b5eaf
F src/tclsqlite.c 6a7eeff5afd8f5f10fcb7fd7806e56c725dd2b07
F src/test1.c c4de690aad182606e5914f6f3c8f43869fbdaaa8
F src/test2.c eaa77124786649eedf47d3c5e94d8070c0da228f
F src/test3.c e85b7ce5c28c3ce7fbdbf7f98e1467b19786c62b
@ -637,7 +637,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 01d26b3df7029f7fa09231c18a7b9f9a1a967916
R d0992888a64e99a48ac01b51393a45d6
P b31dd1e3f1d927b9236b7ebeb331268cbd253083
R ace5a7213a4deb1d4a043bb449b44e95
U drh
Z aef936bb02da51cb904de9fbbd6e9f98
Z 8f67a48d5db1fc547aee4817526d9807

2
manifest.uuid
View File

@ -1 +1 @@
b31dd1e3f1d927b9236b7ebeb331268cbd253083
a88606245760eaf8054d67773db7d8b795e8ca25

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.225 2008/09/23 09:58:47 drh Exp $
** $Id: tclsqlite.c,v 1.226 2008/09/23 10:12:15 drh Exp $
*/
#include "tcl.h"
#include <errno.h>
@ -1343,11 +1343,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(strcmp(zConflict, "rollback") != 0 &&
strcmp(zConflict, "abort" ) != 0 &&
strcmp(zConflict, "fail" ) != 0 &&
strcmp(zConflict, "ignore" ) != 0 &&
strcmp(zConflict, "replace" ) != 0 ) {
Tcl_AppendResult(interp, "Error: \"", zConflict,
"\", conflict-algorithm must be one of: rollback, "
"abort, fail, ignore, or replace", 0);