Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Ensure the tcl interface returns an error when sqlite3_create_function() fails. (CVS 1764) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
357a82cd224e33e11870ad7c2f934c27 |
User & Date: | danielk1977 2004-06-29 13:41:21.000 |
Context
2004-06-29
| ||
13:54 | Fix TRACE7 in os_common.h. (CVS 1765) (check-in: 76e0b74961 user: drh tags: trunk) | |
13:41 | Ensure the tcl interface returns an error when sqlite3_create_function() fails. (CVS 1764) (check-in: 357a82cd22 user: danielk1977 tags: trunk) | |
13:18 | Test cases intended to improve coverage of main.c. (CVS 1763) (check-in: 15a084e9ea user: danielk1977 tags: trunk) | |
Changes
Changes to src/os_test.c.
︙ | ︙ | |||
24 25 26 27 28 29 30 | #define sqlite3OsClose sqlite3RealClose #define sqlite3OsRead sqlite3RealRead #define sqlite3OsWrite sqlite3RealWrite #define sqlite3OsSeek sqlite3RealSeek #define sqlite3OsSync sqlite3RealSync #define sqlite3OsTruncate sqlite3RealTruncate #define sqlite3OsFileSize sqlite3RealFileSize | < | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #define sqlite3OsClose sqlite3RealClose #define sqlite3OsRead sqlite3RealRead #define sqlite3OsWrite sqlite3RealWrite #define sqlite3OsSeek sqlite3RealSeek #define sqlite3OsSync sqlite3RealSync #define sqlite3OsTruncate sqlite3RealTruncate #define sqlite3OsFileSize sqlite3RealFileSize #define sqlite3OsLock sqlite3RealLock #define sqlite3OsUnlock sqlite3RealUnlock #define sqlite3OsCheckReservedLock sqlite3RealCheckReservedLock #define OsFile OsRealFile #define OS_UNIX 1 #include "os_unix.c" |
︙ | ︙ | |||
46 47 48 49 50 51 52 | #undef sqlite3OsClose #undef sqlite3OsRead #undef sqlite3OsWrite #undef sqlite3OsSeek #undef sqlite3OsSync #undef sqlite3OsTruncate #undef sqlite3OsFileSize | < | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | #undef sqlite3OsClose #undef sqlite3OsRead #undef sqlite3OsWrite #undef sqlite3OsSeek #undef sqlite3OsSync #undef sqlite3OsTruncate #undef sqlite3OsFileSize #undef sqlite3OsLock #undef sqlite3OsUnlock #undef sqlite3OsCheckReservedLock #define BLOCKSIZE 512 #define BLOCK_OFFSET(x) ((x) * BLOCKSIZE) |
︙ | ︙ | |||
445 446 447 448 449 450 451 | } int sqlite3OsLock(OsFile *id, int locktype){ return sqlite3RealLock(&(*id)->fd, locktype); } int sqlite3OsUnlock(OsFile *id, int locktype){ return sqlite3RealUnlock(&(*id)->fd, locktype); } | < < < | 443 444 445 446 447 448 449 450 451 452 453 454 | } int sqlite3OsLock(OsFile *id, int locktype){ return sqlite3RealLock(&(*id)->fd, locktype); } int sqlite3OsUnlock(OsFile *id, int locktype){ return sqlite3RealUnlock(&(*id)->fd, locktype); } int sqlite3OsOpenDirectory(const char *zDirname, OsFile *id){ return sqlite3RealOpenDirectory(zDirname, &(*id)->fd); } #endif /* OS_TEST */ |
Changes to src/tclsqlite.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* ** 2001 September 15 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** A TCL Interface to SQLite ** | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* ** 2001 September 15 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** A TCL Interface to SQLite ** ** $Id: tclsqlite.c,v 1.93 2004/06/29 13:41:21 danielk1977 Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ #include "sqliteInt.h" #include "tcl.h" #include <stdlib.h> #include <string.h> |
︙ | ︙ | |||
809 810 811 812 813 814 815 | pFunc = (SqlFunc*)Tcl_Alloc( sizeof(*pFunc) + nScript + 1 ); if( pFunc==0 ) return TCL_ERROR; pFunc->interp = interp; pFunc->pNext = pDb->pFunc; pFunc->zScript = (char*)&pFunc[1]; pDb->pFunc = pFunc; strcpy(pFunc->zScript, zScript); | | > | 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 | pFunc = (SqlFunc*)Tcl_Alloc( sizeof(*pFunc) + nScript + 1 ); if( pFunc==0 ) return TCL_ERROR; pFunc->interp = interp; pFunc->pNext = pDb->pFunc; pFunc->zScript = (char*)&pFunc[1]; pDb->pFunc = pFunc; strcpy(pFunc->zScript, zScript); rc = sqlite3_create_function(pDb->db, zName, -1, SQLITE_UTF8, pFunc, tclSqlFunc, 0, 0); if( rc!=SQLITE_OK ) rc = TCL_ERROR; break; } /* ** $db last_insert_rowid ** ** Return an integer which is the ROWID for the most recent insert. |
︙ | ︙ |
Changes to test/quick.test.
1 2 3 4 5 6 7 8 9 10 11 12 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file runs all tests. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file runs all tests. # # $Id: quick.test,v 1.26 2004/06/29 13:41:21 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl rename finish_test really_finish_test proc finish_test {} {} set ISQUICK 1 |
︙ | ︙ | |||
45 46 47 48 49 50 51 | catch {db close} if {$sqlite_open_file_count>0} { puts "$tail did not close all files: $sqlite_open_file_count" incr nErr lappend ::failList $tail } } | | | 45 46 47 48 49 50 51 52 53 54 55 | catch {db close} if {$sqlite_open_file_count>0} { puts "$tail did not close all files: $sqlite_open_file_count" incr nErr lappend ::failList $tail } } source $testdir/misuse.test set sqlite_open_file_count 0 really_finish_test |