diff options
| -rw-r--r-- | manifest | 22 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/sqliteInt.h | 4 | ||||
| -rw-r--r-- | src/test8.c | 5 | ||||
| -rw-r--r-- | src/vdbe.c | 15 | ||||
| -rw-r--r-- | src/vtab.c | 15 | ||||
| -rw-r--r-- | test/fts2.test | 6 | ||||
| -rw-r--r-- | test/fts3.test | 6 |
8 files changed, 50 insertions, 25 deletions
@@ -1,5 +1,5 @@ -C Update\srequirements\sderivation\sinformation\sin\ssqlite.h.in.\s(CVS\s5462) -D 2008-07-23T15:40:07 +C Read\sthe\ssqlite3_vtab.zErrMsg\safter\seach\scall\sto\sa\svirtual\stable\r\nmethod\sand\stransfer\sany\serror\sinto\sthe\sdatabase\sconnection.\r\nFix\sthe\sfts2.test\sand\sfts3.test\sscripts\sto\sthat\sthey\sreturn\r\nsilently\srather\sthan\sfailing\sthe\stest\ssequence\sif\sthe\sappropriate\r\nFTS\simplementation\sis\sunavailable.\s(CVS\s5463) +D 2008-07-23T18:17:32 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 77ff156061bb870aa0a8b3d545c670d08070f7e6 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -145,7 +145,7 @@ F src/select.c 859ea5194b05fb2f1f816368062478cda5baa9b8 F src/shell.c 4b835fe734304ac22a3385868cd3790c1e4f7aa1 F src/sqlite.h.in 60e7f6d044a6ad45d995569a179ac1f32a69ca2a F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e -F src/sqliteInt.h aebce6d82210334fe00e6d5fa4bb6768cf02f184 +F src/sqliteInt.h ee9c3be4c7466cd36c1ecd36f7a51f05c3f3fd54 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8 F src/status.c 2076bc996618b1a112a797f05c1d62026ae01402 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8 @@ -157,7 +157,7 @@ F src/test4.c ff4ecde3cafc71337b04e8cb7da5bb88e85d70e7 F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4 F src/test6.c 0a0304a69cfa4962a429d084c6d451ff9e4fb572 F src/test7.c 19474b1802858cd2017493c907f70ac2d57ab092 -F src/test8.c 3b85c05b15ccfc6844093791e83d5c8a1e0354ca +F src/test8.c cc541736127cb95fe6966120f546c051e1c8aed8 F src/test9.c 904ebe0ed1472d6bad17a81e2ecbfc20017dc237 F src/test_async.c da9f58f49faccd3a26ba89f58de125862351b6e2 F src/test_autoext.c f53b0cdf7bf5f08100009572a5d65cdb540bd0ad @@ -182,7 +182,7 @@ F src/update.c 4e698fcc0c91c241a960304c4236dc3a49603155 F src/utf.c 8d52f620a7153d90b058502124fe51d821fcdf57 F src/util.c f94d11f931775e325b1a9f97b5cd3005bc4328ba F src/vacuum.c ef342828002debc97514617af3424aea8ef8522c -F src/vdbe.c 179dbe5f08b17c712be65e951eaada3b3ca52092 +F src/vdbe.c 2868150723d81acfade5cfb5ecbd1d7075678aed F src/vdbe.h c46155c221418bea29ee3a749d5950fcf85a70e2 F src/vdbeInt.h 30535c1d30ba1b5fb58d8f0e1d1261af976558aa F src/vdbeapi.c a7c6b8db324cf7eccff32de871dea36aa305c994 @@ -190,7 +190,7 @@ F src/vdbeaux.c 05330c212c77dfd43300bc31bfa0044e4f7ec956 F src/vdbeblob.c a20fe9345062b1a1b4cc187dc5fad45c9414033b F src/vdbefifo.c c46dae1194e4277bf007144d7e5b0c0b1c24f136 F src/vdbemem.c 0c72b58ffd759676ce4829f42bacb83842a58c21 -F src/vtab.c 2096c03ec5540a43c8c73a8f43407dfd3549a982 +F src/vtab.c e67eaa311446ba216d0ffea916586da46e4e13f5 F src/where.c e4c40d224cc6931bece3a33b35bd6b6a8deade3f F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 @@ -299,7 +299,7 @@ F test/fts1m.test 2d9ca67b095d49f037a914087cc0a61e89da4f0c F test/fts1n.test a2317dcd27b1d087ee3878b30e0a59c593c98b7a F test/fts1o.test 382b8b07a2d6de5610814d9477117c4430464b9c F test/fts1porter.test d86e9c3e0c7f8ff95add6582b4b585fb4e02b96d -F test/fts2.test 83704ba4d7956f6646c0c5192a0b16df61e4b2af +F test/fts2.test 2fcc0cfcda440f1eb23b5d7897a8ec7b55a02239 F test/fts2a.test 473a5c8b473a4e21a8e3fddaed1e59666e0c6ab7 F test/fts2b.test 964abc0236c849c07ca1ae496bb25c268ae94816 F test/fts2c.test ffb5a35230ac72c4354535c547965ce6824537c0 @@ -318,7 +318,7 @@ F test/fts2o.test c6a79567d85403dc4d15b89f3f9799a0a0aef065 F test/fts2p.test 4b48c35c91e6a7dbf5ac8d1e5691823cc999aafb F test/fts2q.test b2fbbe038b7a31a52a6079b215e71226d8c6a682 F test/fts2token.test d8070b241a15ff13592a9ae4a8b7c171af6f445a -F test/fts3.test 6ee4c38b0864583c80e82a2d4372f63aae8b10c7 +F test/fts3.test efb41507c90f47e8af2a9101d7460cddeb84656b F test/fts3aa.test 432d1d5c41939bb5405d4d6c80a9ec759b363393 F test/fts3ab.test 7f6cf260ae80dda064023df8e8e503e9a412b91f F test/fts3ac.test 356280144a2c92aa7b11474afadfe62a437fcd69 @@ -611,7 +611,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P dfa8b456630089d385f89c145ae709be85424cd7 -R edd27a2133755e4898b9539bbbcae420 +P d6202907e70d902e967ba116012c274154f30b8d +R a200373e66606e3810078a9ac91f0ca9 U drh -Z 2578787519e46ba47964ea3b2e9f6ce8 +Z c0ffbf6385b1eab9ba3b5076b220096a diff --git a/manifest.uuid b/manifest.uuid index 7c08f3fb4..12fd357c0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d6202907e70d902e967ba116012c274154f30b8d
\ No newline at end of file +e2c6771d44f1b4fee16ef90e91c3498be2a7d2b1
\ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index cd976f14e..07d7a3f81 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.742 2008/07/12 14:52:20 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.743 2008/07/23 18:17:32 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -2215,11 +2215,13 @@ int sqlite3AutoLoadExtensions(sqlite3*); # define sqlite3VtabSync(X,Y) (Y) # define sqlite3VtabRollback(X) # define sqlite3VtabCommit(X) +# define sqlite3VtabTransferError(A,B,C) #else void sqlite3VtabClear(Table*); int sqlite3VtabSync(sqlite3 *db, int rc); int sqlite3VtabRollback(sqlite3 *db); int sqlite3VtabCommit(sqlite3 *db); + void sqlite3VtabTransferError(sqlite3 *db, int, sqlite3_vtab*); #endif void sqlite3VtabMakeWritable(Parse*,Table*); void sqlite3VtabLock(sqlite3_vtab*); diff --git a/src/test8.c b/src/test8.c index 9e4bcb2e5..c64e55d46 100644 --- a/src/test8.c +++ b/src/test8.c @@ -13,7 +13,7 @@ ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** -** $Id: test8.c,v 1.67 2008/07/07 14:50:14 drh Exp $ +** $Id: test8.c,v 1.68 2008/07/23 18:17:32 drh Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -987,6 +987,9 @@ int echoUpdate( if( pRowid && rc==SQLITE_OK ){ *pRowid = sqlite3_last_insert_rowid(db); } + if( rc!=SQLITE_OK ){ + tab->zErrMsg = sqlite3_mprintf("echo-vtab-error: %s", sqlite3_errmsg(db)); + } return rc; } diff --git a/src/vdbe.c b/src/vdbe.c index d65995be0..c1d3c5173 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: vdbe.c,v 1.761 2008/07/11 21:02:54 drh Exp $ +** $Id: vdbe.c,v 1.762 2008/07/23 18:17:32 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -4621,6 +4621,7 @@ case OP_VOpen: { assert(pVtab && pModule); if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse; rc = pModule->xOpen(pVtab, &pVtabCursor); + sqlite3VtabTransferError(db, rc, pVtab); if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; if( SQLITE_OK==rc ){ /* Initialize sqlite3_vtab_cursor base class */ @@ -4665,12 +4666,16 @@ case OP_VFilter: { /* jump */ const sqlite3_module *pModule; Mem *pQuery = &p->aMem[pOp->p3]; Mem *pArgc = &pQuery[1]; + sqlite3_vtab_cursor *pVtabCursor; + sqlite3_vtab *pVtab; Cursor *pCur = p->apCsr[pOp->p1]; REGISTER_TRACE(pOp->p3, pQuery); assert( pCur->pVtabCursor ); - pModule = pCur->pVtabCursor->pVtab->pModule; + pVtabCursor = pCur->pVtabCursor; + pVtab = pVtabCursor->pVtab; + pModule = pVtab->pModule; /* Grab the index number and argc parameters */ assert( (pQuery->flags&MEM_Int)!=0 && pArgc->flags==MEM_Int ); @@ -4689,10 +4694,10 @@ case OP_VFilter: { /* jump */ if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse; p->inVtabMethod = 1; - rc = pModule->xFilter(pCur->pVtabCursor, iQuery, pOp->p4.z, nArg, apArg); + rc = pModule->xFilter(pVtabCursor, iQuery, pOp->p4.z, nArg, apArg); p->inVtabMethod = 0; if( rc==SQLITE_OK ){ - res = pModule->xEof(pCur->pVtabCursor); + res = pModule->xEof(pVtabCursor); } if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; @@ -4847,6 +4852,7 @@ case OP_VRename: { sqlite3VtabLock(pVtab); rc = pVtab->pModule->xRename(pVtab, pName->z); sqlite3VtabUnlock(db, pVtab); + sqlite3VtabTransferError(db, rc, pVtab); if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; break; @@ -4899,6 +4905,7 @@ case OP_VUpdate: { sqlite3VtabLock(pVtab); rc = pModule->xUpdate(pVtab, nArg, apArg, &rowid); sqlite3VtabUnlock(db, pVtab); + sqlite3VtabTransferError(db, rc, pVtab); if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; if( pOp->p1 && rc==SQLITE_OK ){ assert( nArg>1 && apArg[0] && (apArg[0]->flags&MEM_Null) ); diff --git a/src/vtab.c b/src/vtab.c index ab960236e..2c71215de 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to help implement virtual tables. ** -** $Id: vtab.c,v 1.70 2008/06/23 17:44:19 danielk1977 Exp $ +** $Id: vtab.c,v 1.71 2008/07/23 18:17:32 drh Exp $ */ #ifndef SQLITE_OMIT_VIRTUALTABLE #include "sqliteInt.h" @@ -726,6 +726,7 @@ int sqlite3VtabBegin(sqlite3 *db, sqlite3_vtab *pVtab){ /* Invoke the xBegin method */ rc = pModule->xBegin(pVtab); + sqlite3VtabTransferError(db, rc, pVtab); if( rc!=SQLITE_OK ){ return rc; } @@ -787,6 +788,7 @@ FuncDef *sqlite3VtabOverloadFunction( } rc = pMod->xFindFunction(pVtab, nArg, zLowerName, &xFunc, &pArg); sqlite3_free(zLowerName); + sqlite3VtabTransferError(db, rc, pVtab); } if( rc==0 ){ return pDef; @@ -827,4 +829,15 @@ void sqlite3VtabMakeWritable(Parse *pParse, Table *pTab){ } } +/* +** Transfer a virtual table error into the database connection. +*/ +void sqlite3VtabTransferError(sqlite3 *db, int rc, sqlite3_vtab *pVtab){ + if( pVtab->zErrMsg ){ + sqlite3Error(db, rc, "%s", pVtab->zErrMsg); + sqlite3_free(pVtab->zErrMsg); + pVtab->zErrMsg = 0; + } +} + #endif /* SQLITE_OMIT_VIRTUALTABLE */ diff --git a/test/fts2.test b/test/fts2.test index 4487317fd..fa49b061e 100644 --- a/test/fts2.test +++ b/test/fts2.test @@ -1,3 +1,4 @@ +# 2008 July 22 # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. @@ -6,7 +7,7 @@ #*********************************************************************** # This file runs all tests. # -# $Id: fts2.test,v 1.1 2008/07/22 22:57:54 shess Exp $ +# $Id: fts2.test,v 1.2 2008/07/23 18:17:32 drh Exp $ proc lshift {lvar} { upvar $lvar l @@ -33,8 +34,7 @@ set testdir [file dirname $argv0] source $testdir/tester.tcl # If SQLITE_ENABLE_FTS2 is defined, omit this file. ifcapable !fts2 { - puts stderr "this build does not include FTS2 capability" - exit 1 + return } rename finish_test really_finish_test proc finish_test {} {} diff --git a/test/fts3.test b/test/fts3.test index 8de042e65..2e653899b 100644 --- a/test/fts3.test +++ b/test/fts3.test @@ -1,3 +1,4 @@ +# 2007 November 23 # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. @@ -6,7 +7,7 @@ #*********************************************************************** # This file runs all tests. # -# $Id: fts3.test,v 1.1 2007/11/23 17:31:19 drh Exp $ +# $Id: fts3.test,v 1.2 2008/07/23 18:17:32 drh Exp $ proc lshift {lvar} { upvar $lvar l @@ -33,8 +34,7 @@ set testdir [file dirname $argv0] source $testdir/tester.tcl # If SQLITE_ENABLE_FTS3 is defined, omit this file. ifcapable !fts3 { - puts stderr "this build does not include FTS3 capability" - exit 1 + return } rename finish_test really_finish_test proc finish_test {} {} |