Ensure the tcl interface returns an error when sqlite3_create_function()

fails. (CVS 1764)

FossilOrigin-Name: 357a82cd224e33e11870ad7c2f934c27af682881

diff --git a/manifest b/manifest
index 00fa484bf9a49de9b7f439dc949b79171483bbe5..18b670a477895db01356b5ea37f5812607c37d39 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\scases\sintended\sto\simprove\scoverage\sof\smain.c.\s(CVS\s1763)
-D 2004-06-29T13:18:24
+C Ensure\sthe\stcl\sinterface\sreturns\san\serror\swhen\ssqlite3_create_function()\nfails.\s(CVS\s1764)
+D 2004-06-29T13:41:21
 F Makefile.in cb7a9889c38723f72b2506c4236ff30a05ff172b
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -44,7 +44,7 @@ F src/os.h d1780e0db95cad01f213d48da22ab490eb4fd345
 F src/os_common.h 1e745e582138c01d995f190d7544da3e826f6b2f
 F src/os_mac.c 3d31e26be1411acfb7961033098631b4f3486fdf
 F src/os_mac.h 51d2445f47e182ed32d3bd6937f81070c6fd9bd4
-F src/os_test.c ef353f73a2ad85a239d7a77c4a5df2e1377f3848
+F src/os_test.c 5ae69ff4f27ed217833825bc836dcdc6cfecba15
 F src/os_test.h 6a26a4978492e4bbdbf385554958418ff02db162
 F src/os_unix.c 7df6ae05faa5b84164193d3694cb71b66661bbf3
 F src/os_unix.h 00c1f82b526ab2fb7ee5ddd555ea4ed68363c93a
@@ -61,7 +61,7 @@ F src/shell.c 24b641700c9d90f361fcfa4f432c5b4aff704e6d
 F src/sqlite.h.in b70fded2bdfeaddfb06adea3888118b722975136
 F src/sqliteInt.h 4f8d44f04cc51cb421bf3c195247353a5be2e98f
 F src/table.c 4521c278892f60e4d630788c0ea5cf4db1e75c49
-F src/tclsqlite.c 7648310ff0034213f3e58e7272328ed306507e9f
+F src/tclsqlite.c f72288553ca3cdaf686baab4b1797dd98140c501
 F src/test1.c 151df224f7202c2a0d907638f22ed4b0e2378ba9
 F src/test2.c dafd8bd314a554bf376c6d3a8c83fd69219f5a40
 F src/test3.c 7bf0d3fb811a68e009f4c0b228d6daad49176efb
@@ -145,7 +145,7 @@ F test/pager2.test 55469c7c1c1a54d6b32d7b3cc99001e90101a1ce
 F test/pragma.test 212d810e02a51c0ff9784a19d55e35d23382005d
 F test/printf.test 5ed2e033a0b47f901764096bf1907915d6e39406
 F test/progress.test 76c722f090b1ccb575e7e4e203a71608c5763beb x
-F test/quick.test 4c0b3eabe2e0e606622d63d7d61ef6efb3ce156b
+F test/quick.test bbe4abf7f434d71c0de26626c8cbb4858e1bcb18
 F test/quote.test 08f23385c685d3dc7914ec760d492cacea7f6e3d
 F test/rowid.test b3d059f5c8d8874fa1c31030e0636f67405d20ea
 F test/select1.test 813a270ac7996b31ff228e8109cd2d1e8c3fa255
@@ -232,7 +232,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P ba87834d863cb50f3016ccb04f790be5fa4070c6
-R 9de0270fa482c682b722ff7b8c52db20
+P 15a084e9ea14d093f75c54a321f146c18f4453d7
+R d001e9259ada24a86f646313289cd404
 U danielk1977
-Z 981a43dc55972048b9a32ccb906e6f2d
+Z c7e8ad38efdba3cc87c6775c9f97fb1a

diff --git a/manifest.uuid b/manifest.uuid
index f911e09c967cb4022f5407eefa4d9235dda19f9c..c482b8c5855a634b3ad5055cd489a1a15e23ceba 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-15a084e9ea14d093f75c54a321f146c18f4453d7
\ No newline at end of file
+357a82cd224e33e11870ad7c2f934c27af682881
\ No newline at end of file

diff --git a/src/os_test.c b/src/os_test.c
index e884bf7a959a2cd2aeec500455d5a50fc84c4cb5..f9091202c11285d9877f5ebc6a3f6d1fdf9f5f83 100644 (file)
--- a/src/os_test.c
+++ b/src/os_test.c
@@ -28,7 +28,6 @@
 #define sqlite3OsSync              sqlite3RealSync
 #define sqlite3OsTruncate          sqlite3RealTruncate
 #define sqlite3OsFileSize          sqlite3RealFileSize
-#define sqlite3OsFileModTime       sqlite3RealFileModTime
 #define sqlite3OsLock              sqlite3RealLock
 #define sqlite3OsUnlock            sqlite3RealUnlock
 #define sqlite3OsCheckReservedLock sqlite3RealCheckReservedLock
@@ -50,7 +49,6 @@
 #undef sqlite3OsSync              
 #undef sqlite3OsTruncate          
 #undef sqlite3OsFileSize          
-#undef sqlite3OsFileModTime       
 #undef sqlite3OsLock              
 #undef sqlite3OsUnlock            
 #undef sqlite3OsCheckReservedLock 
@@ -449,9 +447,6 @@ int sqlite3OsLock(OsFile *id, int locktype){
 int sqlite3OsUnlock(OsFile *id, int locktype){
   return sqlite3RealUnlock(&(*id)->fd, locktype);
 }
-int sqlite3OsFileModTime(OsFile *id, double *prNow){
-  return sqlite3RealFileModTime(&(*id)->fd, prNow);
-}
 int sqlite3OsOpenDirectory(const char *zDirname, OsFile *id){
   return sqlite3RealOpenDirectory(zDirname, &(*id)->fd);
 }

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index a73a8805010172f4df14eb76e7ca7f7b86d57f95..a1c0bb3cb6884b93e01bd44d5508fe626f5bec60 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.92 2004/06/29 12:39:08 drh Exp $
+** $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 */
 
@@ -813,8 +813,9 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
     pFunc->zScript = (char*)&pFunc[1];
     pDb->pFunc = pFunc;
     strcpy(pFunc->zScript, zScript);
-    sqlite3_create_function(pDb->db, zName, -1, SQLITE_UTF8,
+    rc = sqlite3_create_function(pDb->db, zName, -1, SQLITE_UTF8,
         pFunc, tclSqlFunc, 0, 0);
+    if( rc!=SQLITE_OK ) rc = TCL_ERROR;
     break;
   }
 

diff --git a/test/quick.test b/test/quick.test
index 4260d9b5c0ad6b4451b2c1821a30360272bb237b..872ffed34693b33c67b35495d4379a73587f4b5c 100644 (file)
--- a/test/quick.test
+++ b/test/quick.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: quick.test,v 1.25 2004/06/22 13:12:52 danielk1977 Exp $
+# $Id: quick.test,v 1.26 2004/06/29 13:41:21 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -49,7 +49,7 @@ foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
     lappend ::failList $tail
   }
 }
-# source $testdir/misuse.test
+source $testdir/misuse.test
 
 set sqlite_open_file_count 0
 really_finish_test