1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

Add support for analyzing trigger programs to the sqlite3_expert code.

FossilOrigin-Name: 159e8022a9d6701532b8b60e0c41154bc434c1bbdb107c8c97a78fb1140fa745
This commit is contained in:
dan
2017-04-17 17:03:08 +00:00
parent 2abf90096f
commit 280db65e2c
12 changed files with 340 additions and 122 deletions

View File

@ -260,6 +260,21 @@ do_setup_rec_test $tn.13.3 {
0|0|0|SEARCH TABLE t8 USING INDEX t8_idx_00000061 (a=?) 0|0|0|SEARCH TABLE t8 USING INDEX t8_idx_00000061 (a=?)
} }
# Triggers
#
do_setup_rec_test $tn.14 {
CREATE TABLE t9(a, b, c);
CREATE TABLE t10(a, b, c);
CREATE TRIGGER t9t AFTER INSERT ON t9 BEGIN
UPDATE t10 SET a=new.a WHERE b = new.b;
END;
} {
INSERT INTO t9 VALUES(?, ?, ?);
} {
CREATE INDEX t10_idx_00000062 ON t10(b);
0|0|0|SEARCH TABLE t10 USING INDEX t10_idx_00000062 (b=?)
}
} }
finish_test finish_test

View File

@ -26,6 +26,7 @@ typedef struct IdxConstraint IdxConstraint;
typedef struct IdxScan IdxScan; typedef struct IdxScan IdxScan;
typedef struct IdxStatement IdxStatement; typedef struct IdxStatement IdxStatement;
typedef struct IdxTable IdxTable; typedef struct IdxTable IdxTable;
typedef struct IdxWrite IdxWrite;
/* /*
** A single constraint. Equivalent to either "col = ?" or "col < ?" (or ** A single constraint. Equivalent to either "col = ?" or "col < ?" (or
@ -74,6 +75,17 @@ struct IdxTable {
IdxTable *pNext; /* Next table in linked list of all tables */ IdxTable *pNext; /* Next table in linked list of all tables */
}; };
/*
** An object of the following type is created for each unique table/write-op
** seen. The objects are stored in a singly-linked list beginning at
** sqlite3expert.pWrite.
*/
struct IdxWrite {
IdxTable *pTab;
int eOp; /* SQLITE_UPDATE, DELETE or INSERT */
IdxWrite *pNext;
};
/* /*
** Each statement being analyzed is represented by an instance of this ** Each statement being analyzed is represented by an instance of this
** structure. ** structure.
@ -118,8 +130,8 @@ struct sqlite3expert {
sqlite3 *dbm; /* In-memory db for this analysis */ sqlite3 *dbm; /* In-memory db for this analysis */
sqlite3 *dbv; /* Vtab schema for this analysis */ sqlite3 *dbv; /* Vtab schema for this analysis */
IdxTable *pTable; /* List of all IdxTable objects */ IdxTable *pTable; /* List of all IdxTable objects */
IdxScan *pScan; /* List of scan objects */ IdxScan *pScan; /* List of scan objects */
IdxWrite *pWrite; /* List of write objects */
IdxStatement *pStatement; /* List of IdxStatement objects */ IdxStatement *pStatement; /* List of IdxStatement objects */
int bRun; /* True once analysis has run */ int bRun; /* True once analysis has run */
char **pzErrmsg; char **pzErrmsg;
@ -406,6 +418,15 @@ static int expertBestIndex(sqlite3_vtab *pVtab, sqlite3_index_info *pIdxInfo){
return rc; return rc;
} }
static int expertUpdate(
sqlite3_vtab *pVtab,
int nData,
sqlite3_value **azData,
sqlite_int64 *pRowid
){
return SQLITE_OK;
}
static int idxRegisterVtab(sqlite3expert *p){ static int idxRegisterVtab(sqlite3expert *p){
static sqlite3_module expertModule = { static sqlite3_module expertModule = {
2, /* iVersion */ 2, /* iVersion */
@ -421,7 +442,7 @@ static int idxRegisterVtab(sqlite3expert *p){
0, /* xEof */ 0, /* xEof */
0, /* xColumn - read data */ 0, /* xColumn - read data */
0, /* xRowid - read data */ 0, /* xRowid - read data */
0, /* xUpdate - write data */ expertUpdate, /* xUpdate - write data */
0, /* xBegin - begin transaction */ 0, /* xBegin - begin transaction */
0, /* xSync - sync transaction */ 0, /* xSync - sync transaction */
0, /* xCommit - commit transaction */ 0, /* xCommit - commit transaction */
@ -926,6 +947,19 @@ static void idxTableFree(IdxTable *pTab){
} }
} }
/*
** Free the linked list of IdxWrite objects starting at pTab.
*/
static void idxWriteFree(IdxWrite *pTab){
IdxWrite *pIter;
IdxWrite *pNext;
for(pIter=pTab; pIter; pIter=pNext){
pNext = pIter->pNext;
sqlite3_free(pIter);
}
}
/* /*
** This function is called after candidate indexes have been created. It ** This function is called after candidate indexes have been created. It
@ -997,6 +1031,139 @@ int idxFindIndexes(
return rc; return rc;
} }
static int idxAuthCallback(
void *pCtx,
int eOp,
const char *z3,
const char *z4,
const char *zDb,
const char *zTrigger
){
int rc = SQLITE_OK;
if( eOp==SQLITE_INSERT || eOp==SQLITE_UPDATE || eOp==SQLITE_DELETE ){
if( sqlite3_stricmp(zDb, "main")==0 ){
sqlite3expert *p = (sqlite3expert*)pCtx;
IdxTable *pTab;
for(pTab=p->pTable; pTab; pTab=pTab->pNext){
if( 0==sqlite3_stricmp(z3, pTab->zName) ) break;
}
if( pTab ){
IdxWrite *pWrite;
for(pWrite=p->pWrite; pWrite; pWrite=pWrite->pNext){
if( pWrite->pTab==pTab && pWrite->eOp==eOp ) break;
}
if( pWrite==0 ){
pWrite = idxMalloc(&rc, sizeof(IdxWrite));
if( rc==SQLITE_OK ){
pWrite->pTab = pTab;
pWrite->eOp = eOp;
pWrite->pNext = p->pWrite;
p->pWrite = pWrite;
}
}
}
}
}
return rc;
}
static int idxProcessOneTrigger(
sqlite3expert *p,
IdxWrite *pWrite,
char **pzErr
){
static const char *zInt = "t592690916721053953805701627921227776";
static const char *zDrop = "DROP TABLE t592690916721053953805701627921227776";
IdxTable *pTab = pWrite->pTab;
const char *zTab = pTab->zName;
const char *zSql =
"SELECT 'CREATE TEMP' || substr(sql, 7) FROM sqlite_master "
"WHERE tbl_name = %Q AND type IN ('table', 'trigger') "
"ORDER BY type;";
sqlite3_stmt *pSelect = 0;
int rc = SQLITE_OK;
char *zWrite = 0;
/* Create the table and its triggers in the temp schema */
rc = idxPrintfPrepareStmt(p->db, &pSelect, pzErr, zSql, zTab, zTab);
while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pSelect) ){
const char *zCreate = (const char*)sqlite3_column_text(pSelect, 0);
rc = sqlite3_exec(p->dbv, zCreate, 0, 0, pzErr);
}
idxFinalize(&rc, pSelect);
/* Rename the table in the temp schema to zInt */
if( rc==SQLITE_OK ){
char *z = sqlite3_mprintf("ALTER TABLE temp.%Q RENAME TO %Q", zTab, zInt);
if( z==0 ){
rc = SQLITE_NOMEM;
}else{
rc = sqlite3_exec(p->dbv, z, 0, 0, pzErr);
sqlite3_free(z);
}
}
switch( pWrite->eOp ){
case SQLITE_INSERT: {
int i;
zWrite = idxAppendText(&rc, zWrite, "INSERT INTO %Q VALUES(", zInt);
for(i=0; i<pTab->nCol; i++){
zWrite = idxAppendText(&rc, zWrite, "%s?", i==0 ? "" : ", ");
}
zWrite = idxAppendText(&rc, zWrite, ")");
break;
}
case SQLITE_UPDATE: {
int i;
zWrite = idxAppendText(&rc, zWrite, "UPDATE %Q SET ", zInt);
for(i=0; i<pTab->nCol; i++){
zWrite = idxAppendText(&rc, zWrite, "%s%Q=?", i==0 ? "" : ", ",
pTab->aCol[i].zName
);
}
break;
}
default: {
assert( pWrite->eOp==SQLITE_DELETE );
if( rc==SQLITE_OK ){
zWrite = sqlite3_mprintf("DELETE FROM %Q", zInt);
if( zWrite==0 ) rc = SQLITE_NOMEM;
}
}
}
if( rc==SQLITE_OK ){
sqlite3_stmt *pX = 0;
rc = sqlite3_prepare_v2(p->dbv, zWrite, -1, &pX, 0);
idxFinalize(&rc, pX);
}
sqlite3_free(zWrite);
if( rc==SQLITE_OK ){
rc = sqlite3_exec(p->dbv, zDrop, 0, 0, pzErr);
}
return rc;
}
static int idxProcessTriggers(sqlite3expert *p, char **pzErr){
int rc = SQLITE_OK;
IdxWrite *pEnd = 0;
IdxWrite *pFirst = p->pWrite;
while( rc==SQLITE_OK && pFirst!=pEnd ){
IdxWrite *pIter;
for(pIter=pFirst; rc==SQLITE_OK && pIter!=pEnd; pIter=pIter->pNext){
rc = idxProcessOneTrigger(p, pIter, pzErr);
}
pEnd = pFirst;
pFirst = p->pWrite;
}
return rc;
}
static int idxCreateVtabSchema(sqlite3expert *p, char **pzErrmsg){ static int idxCreateVtabSchema(sqlite3expert *p, char **pzErrmsg){
int rc = idxRegisterVtab(p); int rc = idxRegisterVtab(p);
sqlite3_stmt *pSchema = 0; sqlite3_stmt *pSchema = 0;
@ -1073,7 +1240,11 @@ sqlite3expert *sqlite3_expert_new(sqlite3 *db, char **pzErrmsg){
} }
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
rc = sqlite3_open(":memory:", &pNew->dbm); rc = sqlite3_open(":memory:", &pNew->dbm);
if( rc==SQLITE_OK ){
sqlite3_db_config(pNew->dbm, SQLITE_DBCONFIG_FULL_EQP, 1, (int*)0);
}
} }
/* Copy the entire schema of database [db] into [dbm]. */ /* Copy the entire schema of database [db] into [dbm]. */
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
@ -1093,6 +1264,11 @@ sqlite3expert *sqlite3_expert_new(sqlite3 *db, char **pzErrmsg){
rc = idxCreateVtabSchema(pNew, pzErrmsg); rc = idxCreateVtabSchema(pNew, pzErrmsg);
} }
/* Register the auth callback with dbv */
if( rc==SQLITE_OK ){
sqlite3_set_authorizer(pNew->dbv, idxAuthCallback, (void*)pNew);
}
/* If an error has occurred, free the new object and reutrn NULL. Otherwise, /* If an error has occurred, free the new object and reutrn NULL. Otherwise,
** return the new sqlite3expert handle. */ ** return the new sqlite3expert handle. */
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
@ -1136,7 +1312,7 @@ int sqlite3_expert_sql(
sqlite3_finalize(pStmt); sqlite3_finalize(pStmt);
} }
}else{ }else{
idxDatabaseError(p->db, pzErr); idxDatabaseError(p->dbv, pzErr);
} }
} }
@ -1154,8 +1330,12 @@ int sqlite3_expert_analyze(sqlite3expert *p, char **pzErr){
int rc; int rc;
IdxHashEntry *pEntry; IdxHashEntry *pEntry;
rc = idxProcessTriggers(p, pzErr);
/* Create candidate indexes within the in-memory database file */ /* Create candidate indexes within the in-memory database file */
rc = idxCreateCandidates(p, pzErr); if( rc==SQLITE_OK ){
rc = idxCreateCandidates(p, pzErr);
}
/* Formulate the EXPERT_REPORT_CANDIDATES text */ /* Formulate the EXPERT_REPORT_CANDIDATES text */
for(pEntry=p->hIdx.pFirst; pEntry; pEntry=pEntry->pNext){ for(pEntry=p->hIdx.pFirst; pEntry; pEntry=pEntry->pNext){
@ -1220,6 +1400,7 @@ void sqlite3_expert_destroy(sqlite3expert *p){
idxScanFree(p->pScan, 0); idxScanFree(p->pScan, 0);
idxStatementFree(p->pStatement, 0); idxStatementFree(p->pStatement, 0);
idxTableFree(p->pTable); idxTableFree(p->pTable);
idxWriteFree(p->pWrite);
idxHashClear(&p->hIdx); idxHashClear(&p->hIdx);
sqlite3_free(p->zCandidates); sqlite3_free(p->zCandidates);
sqlite3_free(p); sqlite3_free(p);

View File

@ -1,5 +1,5 @@
C Fix\sproblems\swith\shandling\sconstraints\son\sthe\srowid\scolumn\sin\ssqlite3expert.c. C Add\ssupport\sfor\sanalyzing\strigger\sprograms\sto\sthe\ssqlite3_expert\scode.
D 2017-04-15T16:52:12.782 D 2017-04-17T17:03:08.723
F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6 F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
@ -42,8 +42,8 @@ F ext/async/sqlite3async.c 0f3070cc3f5ede78f2b9361fb3b629ce200d7d74
F ext/async/sqlite3async.h f489b080af7e72aec0e1ee6f1d98ab6cf2e4dcef F ext/async/sqlite3async.h f489b080af7e72aec0e1ee6f1d98ab6cf2e4dcef
F ext/expert/README.md 9f15075ec5ad772808eff55ef044c31140fd1146aa0a3c47eafd155e71851b01 F ext/expert/README.md 9f15075ec5ad772808eff55ef044c31140fd1146aa0a3c47eafd155e71851b01
F ext/expert/expert.c 6349cf8d26c847f5f0fa7e25772b614c67f60f3c850dca0d75d55eb27cf3f69b F ext/expert/expert.c 6349cf8d26c847f5f0fa7e25772b614c67f60f3c850dca0d75d55eb27cf3f69b
F ext/expert/expert1.test c08c95fd81e80073def8bdbf30b67934a9c20193b3632e5f27565ef88f964809 F ext/expert/expert1.test 6a50a1538dc9e4ff360fb117298aa3b085beed030cbe15dd36803da1a9f70702
F ext/expert/sqlite3expert.c d73a4813af4c8097bb574113c91abf9c0ec06a7af47c80227a160a7c413265b5 F ext/expert/sqlite3expert.c f9f41caf6d941b52ef76043f3191ab05294f4d286425e34923a7d74876014f0b
F ext/expert/sqlite3expert.h b1c9eedeb647fd734c4206ae6851635284cfbfa5fb688eff74c3265c9f949b4d F ext/expert/sqlite3expert.h b1c9eedeb647fd734c4206ae6851635284cfbfa5fb688eff74c3265c9f949b4d
F ext/expert/test_expert.c bad0611732d07180d586bd589cbb7713dc3ab0338c52bff29680eb2007678c05 F ext/expert/test_expert.c bad0611732d07180d586bd589cbb7713dc3ab0338c52bff29680eb2007678c05
F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
@ -353,7 +353,7 @@ F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
F src/btree.c 24ae5472bd0b53b4130ecdda389deb621af721d1fcb50890b878102b00bd10fa F src/btree.c 24ae5472bd0b53b4130ecdda389deb621af721d1fcb50890b878102b00bd10fa
F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc
F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610 F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f F src/build.c 3fd46781483b527ee18508e7854e87e60a259211bb9bbf16b6fafaf08a043a64
F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
@ -372,7 +372,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
F src/insert.c d4bb3a135948553d18cf992f76f7ed7b18aa0327f250607b5a6671e55d9947d5 F src/insert.c d4bb3a135948553d18cf992f76f7ed7b18aa0327f250607b5a6671e55d9947d5
F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0 F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9 F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9
F src/main.c 158326243c5ddc8b98a1e983fa488650cf76d760 F src/main.c ffb658429483c0d1c604014c631871f64b8db19666d8b70f75c7512d003ac1ad
F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978 F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@ -402,17 +402,17 @@ F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
F src/pragma.c 150821702fc90694b46c3432c1402fc970a4c5b8595cb13c21aeb568f9a78fc3 F src/pragma.c 150821702fc90694b46c3432c1402fc970a4c5b8595cb13c21aeb568f9a78fc3
F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921 F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921
F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a F src/prepare.c 7c46b5c7be9e19a1bf87777f0b7f9fb257b5ff9856c46de49f2354acfbeb4c86
F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2 F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
F src/resolve.c 3e518b962d932a997fae373366880fc028c75706 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
F src/select.c 4588dcfb0fa430012247a209ba08e17904dd32ec7690e9cb6c85e0ef012b0518 F src/select.c 4588dcfb0fa430012247a209ba08e17904dd32ec7690e9cb6c85e0ef012b0518
F src/shell.c 70f4957b988572315e97c56941fdc81fd35907fee36b7b2e7be5ec4c7e9d065d F src/shell.c 70f4957b988572315e97c56941fdc81fd35907fee36b7b2e7be5ec4c7e9d065d
F src/sqlite.h.in 18b4f1367bb80c07a6883c75c18267de2b977960adf1f30c783a731691eae3b0 F src/sqlite.h.in 900a07463a87be50b9954817f4c24a0660b4c4ddc1bfe83dedea484c6ac98425
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28 F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
F src/sqliteInt.h bd00872a45aa8eaa262301436bb63dc0afa685ceab7361790b065d5802269650 F src/sqliteInt.h 0e520ab49f019221dd5a17b6e4006523ce4f33d88b20bcf9115d11952a487c39
F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@ -469,16 +469,16 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
F src/tokenize.c 1003d6d90c6783206c711f0a9397656fa5b055209f4d092caa43bb3bf5215db5 F src/tokenize.c 1003d6d90c6783206c711f0a9397656fa5b055209f4d092caa43bb3bf5215db5
F src/treeview.c b92d57c1ac59f4a3f6b189506921a2b48098f6f4d6afd0b715bc2815ef6af092 F src/treeview.c b92d57c1ac59f4a3f6b189506921a2b48098f6f4d6afd0b715bc2815ef6af092
F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182 F src/trigger.c 134b8e7b61317ab7b2a2dd12eb1b9aa2e23ac5bc4a05e63e35b3609b6b30a7c0
F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6 F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569 F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
F src/vdbe.c 808fda3d50f544120d27c731449b524b4ec8f8b0f734b228831078f0ba53ecb9 F src/vdbe.c 314f0a70ddc29e63f131dfbe6f53c277875d3028cdf5654a709e21cab39fe0c9
F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848 F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848
F src/vdbeInt.h c070bc5c8b913bda0ceaa995cd4d939ded5e4fc96cf7c3c1c602d41b871f8ade F src/vdbeInt.h c070bc5c8b913bda0ceaa995cd4d939ded5e4fc96cf7c3c1c602d41b871f8ade
F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860 F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
F src/vdbeaux.c 6b3f6ce909e206d4c918988b13b7fa687e92b4471d137e0f2a37edac80ec60be F src/vdbeaux.c 526b617ac6b5e167a6bd581e067f1ee1dbcb06e7802cff46b76fb1c02ed7d34e
F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9 F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
F src/vdbemem.c 3122f5a21064198c10ee1b4686937aab27d5395712d9af905b7fa1affc47a453 F src/vdbemem.c 3122f5a21064198c10ee1b4686937aab27d5395712d9af905b7fa1affc47a453
F src/vdbesort.c e72fe02a2121386ba767ede8942e9450878b8fc873abf3d1b6824485f092570c F src/vdbesort.c e72fe02a2121386ba767ede8942e9450878b8fc873abf3d1b6824485f092570c
@ -1579,7 +1579,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 2d0c458e013cb2d02fbeabed8dabd66f55141aac194611f0e599b3c95af1964f P 2e6308798ae2db30564deb35ba3896597448edabbcac6efc4ff084552e42de30
R d323d2b5ffa5632b2c495cb6bacbb016 R 3935ba65365bf244da478b55268b3a1f
U dan U dan
Z 2344908fdbfea0ffd0d694cf678615cc Z 871de5d26699f20ec603c0a41beb3b11

View File

@ -1 +1 @@
2e6308798ae2db30564deb35ba3896597448edabbcac6efc4ff084552e42de30 159e8022a9d6701532b8b60e0c41154bc434c1bbdb107c8c97a78fb1140fa745

View File

@ -479,7 +479,7 @@ void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char *zIdxName){
} }
freeIndex(db, pIndex); freeIndex(db, pIndex);
} }
db->flags |= SQLITE_InternChanges; db->bInternChanges = 1;
} }
/* /*
@ -551,7 +551,7 @@ void sqlite3ResetAllSchemasOfConnection(sqlite3 *db){
sqlite3SchemaClear(pDb->pSchema); sqlite3SchemaClear(pDb->pSchema);
} }
} }
db->flags &= ~SQLITE_InternChanges; db->bInternChanges = 0;
sqlite3VtabUnlockList(db); sqlite3VtabUnlockList(db);
sqlite3BtreeLeaveAll(db); sqlite3BtreeLeaveAll(db);
sqlite3CollapseDatabaseArray(db); sqlite3CollapseDatabaseArray(db);
@ -561,7 +561,7 @@ void sqlite3ResetAllSchemasOfConnection(sqlite3 *db){
** This routine is called when a commit occurs. ** This routine is called when a commit occurs.
*/ */
void sqlite3CommitInternalChanges(sqlite3 *db){ void sqlite3CommitInternalChanges(sqlite3 *db){
db->flags &= ~SQLITE_InternChanges; db->bInternChanges = 0;
} }
/* /*
@ -665,7 +665,7 @@ void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char *zTabName){
pDb = &db->aDb[iDb]; pDb = &db->aDb[iDb];
p = sqlite3HashInsert(&pDb->pSchema->tblHash, zTabName, 0); p = sqlite3HashInsert(&pDb->pSchema->tblHash, zTabName, 0);
sqlite3DeleteTable(db, p); sqlite3DeleteTable(db, p);
db->flags |= SQLITE_InternChanges; db->bInternChanges = 1;
} }
/* /*
@ -2051,7 +2051,7 @@ void sqlite3EndTable(
return; return;
} }
pParse->pNewTable = 0; pParse->pNewTable = 0;
db->flags |= SQLITE_InternChanges; db->bInternChanges = 1;
#ifndef SQLITE_OMIT_ALTERTABLE #ifndef SQLITE_OMIT_ALTERTABLE
if( !p->pSelect ){ if( !p->pSelect ){
@ -3320,7 +3320,7 @@ void sqlite3CreateIndex(
sqlite3OomFault(db); sqlite3OomFault(db);
goto exit_create_index; goto exit_create_index;
} }
db->flags |= SQLITE_InternChanges; db->bInternChanges = 1;
if( pTblName!=0 ){ if( pTblName!=0 ){
pIndex->tnum = db->init.newTnum; pIndex->tnum = db->init.newTnum;
} }

View File

@ -811,6 +811,7 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){
{ SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer }, { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer },
{ SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION, SQLITE_LoadExtension }, { SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION, SQLITE_LoadExtension },
{ SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE, SQLITE_NoCkptOnClose }, { SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE, SQLITE_NoCkptOnClose },
{ SQLITE_DBCONFIG_FULL_EQP, SQLITE_FullEQP },
}; };
unsigned int i; unsigned int i;
rc = SQLITE_ERROR; /* IMP: R-42790-23372 */ rc = SQLITE_ERROR; /* IMP: R-42790-23372 */
@ -1252,7 +1253,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){
** the database rollback and schema reset, which can cause false ** the database rollback and schema reset, which can cause false
** corruption reports in some cases. */ ** corruption reports in some cases. */
sqlite3BtreeEnterAll(db); sqlite3BtreeEnterAll(db);
schemaChange = (db->flags & SQLITE_InternChanges)!=0 && db->init.busy==0; schemaChange = db->bInternChanges && db->init.busy==0;
for(i=0; i<db->nDb; i++){ for(i=0; i<db->nDb; i++){
Btree *p = db->aDb[i].pBt; Btree *p = db->aDb[i].pBt;
@ -1266,7 +1267,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){
sqlite3VtabRollback(db); sqlite3VtabRollback(db);
sqlite3EndBenignMalloc(); sqlite3EndBenignMalloc();
if( (db->flags&SQLITE_InternChanges)!=0 && db->init.busy==0 ){ if( db->bInternChanges && db->init.busy==0 ){
sqlite3ExpirePreparedStatements(db); sqlite3ExpirePreparedStatements(db);
sqlite3ResetAllSchemasOfConnection(db); sqlite3ResetAllSchemasOfConnection(db);
} }

View File

@ -354,7 +354,7 @@ error_out:
*/ */
int sqlite3Init(sqlite3 *db, char **pzErrMsg){ int sqlite3Init(sqlite3 *db, char **pzErrMsg){
int i, rc; int i, rc;
int commit_internal = !(db->flags&SQLITE_InternChanges); int commit_internal = db->bInternChanges==0;
assert( sqlite3_mutex_held(db->mutex) ); assert( sqlite3_mutex_held(db->mutex) );
assert( sqlite3BtreeHoldsMutex(db->aDb[0].pBt) ); assert( sqlite3BtreeHoldsMutex(db->aDb[0].pBt) );

View File

@ -2007,6 +2007,16 @@ struct sqlite3_mem_methods {
** have been disabled - 0 if they are not disabled, 1 if they are. ** have been disabled - 0 if they are not disabled, 1 if they are.
** </dd> ** </dd>
** **
** <dt>SQLITE_DBCONFIG_FULL_EQP</dt>
** <dd> By default, the output of EXPLAIN QUERY PLAN commands does not
** include output for any operations performed by trigger programs. This
** option is used to set or clear (the default) a flag that governs this
** behavior. The first parameter passed to this operation is an integer -
** non-zero to enable output for trigger programs, or zero to disable it.
** The second parameter is a pointer to an integer into which is written
** 0 or 1 to indicate whether output-for-triggers has been disabled - 0 if
** it is not disabled, 1 if it is.
** </dd>
** </dl> ** </dl>
*/ */
#define SQLITE_DBCONFIG_MAINDBNAME 1000 /* const char* */ #define SQLITE_DBCONFIG_MAINDBNAME 1000 /* const char* */
@ -2016,6 +2026,7 @@ struct sqlite3_mem_methods {
#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */ #define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
#define SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION 1005 /* int int* */ #define SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION 1005 /* int int* */
#define SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE 1006 /* int int* */ #define SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE 1006 /* int int* */
#define SQLITE_DBCONFIG_FULL_EQP 1007 /* int int* */
/* /*

View File

@ -1334,6 +1334,7 @@ struct sqlite3 {
u8 mTrace; /* zero or more SQLITE_TRACE flags */ u8 mTrace; /* zero or more SQLITE_TRACE flags */
u8 skipBtreeMutex; /* True if no shared-cache backends */ u8 skipBtreeMutex; /* True if no shared-cache backends */
u8 nSqlExec; /* Number of pending OP_SqlExec opcodes */ u8 nSqlExec; /* Number of pending OP_SqlExec opcodes */
u8 bInternChanges; /* There are uncommited schema changes */
int nextPagesize; /* Pagesize after VACUUM if >0 */ int nextPagesize; /* Pagesize after VACUUM if >0 */
u32 magic; /* Magic number for detect library misuse */ u32 magic; /* Magic number for detect library misuse */
int nChange; /* Value returned by sqlite3_changes() */ int nChange; /* Value returned by sqlite3_changes() */
@ -1449,7 +1450,7 @@ struct sqlite3 {
** SQLITE_CacheSpill == PAGER_CACHE_SPILL ** SQLITE_CacheSpill == PAGER_CACHE_SPILL
*/ */
#define SQLITE_VdbeTrace 0x00000001 /* True to trace VDBE execution */ #define SQLITE_VdbeTrace 0x00000001 /* True to trace VDBE execution */
#define SQLITE_InternChanges 0x00000002 /* Uncommitted Hash table changes */ #define SQLITE_FullEQP 0x00000002 /* Include triggers in EQP output */
#define SQLITE_FullColNames 0x00000004 /* Show full column names on SELECT */ #define SQLITE_FullColNames 0x00000004 /* Show full column names on SELECT */
#define SQLITE_FullFSync 0x00000008 /* Use full fsync on the backend */ #define SQLITE_FullFSync 0x00000008 /* Use full fsync on the backend */
#define SQLITE_CkptFullFSync 0x00000010 /* Use full fsync for checkpoint */ #define SQLITE_CkptFullFSync 0x00000010 /* Use full fsync for checkpoint */

View File

@ -584,7 +584,7 @@ void sqlite3UnlinkAndDeleteTrigger(sqlite3 *db, int iDb, const char *zName){
*pp = (*pp)->pNext; *pp = (*pp)->pNext;
} }
sqlite3DeleteTrigger(db, pTrigger); sqlite3DeleteTrigger(db, pTrigger);
db->flags |= SQLITE_InternChanges; db->bInternChanges = 1;
} }
} }

View File

@ -3037,7 +3037,7 @@ case OP_Savepoint: {
int isSchemaChange; int isSchemaChange;
iSavepoint = db->nSavepoint - iSavepoint - 1; iSavepoint = db->nSavepoint - iSavepoint - 1;
if( p1==SAVEPOINT_ROLLBACK ){ if( p1==SAVEPOINT_ROLLBACK ){
isSchemaChange = (db->flags & SQLITE_InternChanges)!=0; isSchemaChange = db->bInternChanges;
for(ii=0; ii<db->nDb; ii++){ for(ii=0; ii<db->nDb; ii++){
rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt, rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt,
SQLITE_ABORT_ROLLBACK, SQLITE_ABORT_ROLLBACK,
@ -3056,7 +3056,7 @@ case OP_Savepoint: {
if( isSchemaChange ){ if( isSchemaChange ){
sqlite3ExpirePreparedStatements(db); sqlite3ExpirePreparedStatements(db);
sqlite3ResetAllSchemasOfConnection(db); sqlite3ResetAllSchemasOfConnection(db);
db->flags = (db->flags | SQLITE_InternChanges); db->bInternChanges = 1;
} }
} }
@ -3336,7 +3336,7 @@ case OP_SetCookie: {
if( pOp->p2==BTREE_SCHEMA_VERSION ){ if( pOp->p2==BTREE_SCHEMA_VERSION ){
/* When the schema cookie changes, record the new cookie internally */ /* When the schema cookie changes, record the new cookie internally */
pDb->pSchema->schema_cookie = pOp->p3; pDb->pSchema->schema_cookie = pOp->p3;
db->flags |= SQLITE_InternChanges; db->bInternChanges = 1;
}else if( pOp->p2==BTREE_FILE_FORMAT ){ }else if( pOp->p2==BTREE_FILE_FORMAT ){
/* Record changes in the file format */ /* Record changes in the file format */
pDb->pSchema->file_format = pOp->p3; pDb->pSchema->file_format = pOp->p3;

View File

@ -1611,6 +1611,8 @@ int sqlite3VdbeList(
int i; /* Loop counter */ int i; /* Loop counter */
int rc = SQLITE_OK; /* Return code */ int rc = SQLITE_OK; /* Return code */
Mem *pMem = &p->aMem[1]; /* First Mem of result set */ Mem *pMem = &p->aMem[1]; /* First Mem of result set */
int bFull = (p->explain==1 || (db->flags & SQLITE_FullEQP));
Op *pOp;
assert( p->explain ); assert( p->explain );
assert( p->magic==VDBE_MAGIC_RUN ); assert( p->magic==VDBE_MAGIC_RUN );
@ -1638,7 +1640,7 @@ int sqlite3VdbeList(
** encountered, but p->pc will eventually catch up to nRow. ** encountered, but p->pc will eventually catch up to nRow.
*/ */
nRow = p->nOp; nRow = p->nOp;
if( p->explain==1 ){ if( bFull ){
/* The first 8 memory cells are used for the result set. So we will /* The first 8 memory cells are used for the result set. So we will
** commandeer the 9th cell to use as storage for an array of pointers ** commandeer the 9th cell to use as storage for an array of pointers
** to trigger subprograms. The VDBE is guaranteed to have at least 9 ** to trigger subprograms. The VDBE is guaranteed to have at least 9
@ -1658,17 +1660,11 @@ int sqlite3VdbeList(
do{ do{
i = p->pc++; i = p->pc++;
}while( i<nRow && p->explain==2 && p->aOp[i].opcode!=OP_Explain ); if( i>=nRow ){
if( i>=nRow ){ p->rc = SQLITE_OK;
p->rc = SQLITE_OK; rc = SQLITE_DONE;
rc = SQLITE_DONE; break;
}else if( db->u1.isInterrupted ){ }
p->rc = SQLITE_INTERRUPT;
rc = SQLITE_ERROR;
sqlite3VdbeError(p, sqlite3ErrStr(p->rc));
}else{
char *zP4;
Op *pOp;
if( i<p->nOp ){ if( i<p->nOp ){
/* The output line number is small enough that we are still in the /* The output line number is small enough that we are still in the
** main program. */ ** main program. */
@ -1683,94 +1679,107 @@ int sqlite3VdbeList(
} }
pOp = &apSub[j]->aOp[i]; pOp = &apSub[j]->aOp[i];
} }
if( p->explain==1 ){
pMem->flags = MEM_Int;
pMem->u.i = i; /* Program counter */
pMem++;
pMem->flags = MEM_Static|MEM_Str|MEM_Term;
pMem->z = (char*)sqlite3OpcodeName(pOp->opcode); /* Opcode */
assert( pMem->z!=0 );
pMem->n = sqlite3Strlen30(pMem->z);
pMem->enc = SQLITE_UTF8;
pMem++;
/* When an OP_Program opcode is encounter (the only opcode that has /* When an OP_Program opcode is encounter (the only opcode that has
** a P4_SUBPROGRAM argument), expand the size of the array of subprograms ** a P4_SUBPROGRAM argument), expand the size of the array of subprograms
** kept in p->aMem[9].z to hold the new program - assuming this subprogram ** kept in p->aMem[9].z to hold the new program - assuming this subprogram
** has not already been seen. ** has not already been seen.
*/ */
if( pOp->p4type==P4_SUBPROGRAM ){ if( bFull && pOp->p4type==P4_SUBPROGRAM ){
int nByte = (nSub+1)*sizeof(SubProgram*); int nByte = (nSub+1)*sizeof(SubProgram*);
int j; int j;
for(j=0; j<nSub; j++){ for(j=0; j<nSub; j++){
if( apSub[j]==pOp->p4.pProgram ) break; if( apSub[j]==pOp->p4.pProgram ) break;
} }
if( j==nSub && SQLITE_OK==sqlite3VdbeMemGrow(pSub, nByte, nSub!=0) ){ if( j==nSub ){
apSub = (SubProgram **)pSub->z; rc = sqlite3VdbeMemGrow(pSub, nByte, nSub!=0);
apSub[nSub++] = pOp->p4.pProgram; if( rc!=SQLITE_OK ) break;
pSub->flags |= MEM_Blob; apSub = (SubProgram **)pSub->z;
pSub->n = nSub*sizeof(SubProgram*); apSub[nSub++] = pOp->p4.pProgram;
} pSub->flags |= MEM_Blob;
pSub->n = nSub*sizeof(SubProgram*);
nRow += pOp->p4.pProgram->nOp;
} }
} }
}while( p->explain==2 && pOp->opcode!=OP_Explain );
pMem->flags = MEM_Int; if( rc==SQLITE_OK ){
pMem->u.i = pOp->p1; /* P1 */ if( db->u1.isInterrupted ){
pMem++; p->rc = SQLITE_INTERRUPT;
rc = SQLITE_ERROR;
pMem->flags = MEM_Int; sqlite3VdbeError(p, sqlite3ErrStr(p->rc));
pMem->u.i = pOp->p2; /* P2 */
pMem++;
pMem->flags = MEM_Int;
pMem->u.i = pOp->p3; /* P3 */
pMem++;
if( sqlite3VdbeMemClearAndResize(pMem, 100) ){ /* P4 */
assert( p->db->mallocFailed );
return SQLITE_ERROR;
}
pMem->flags = MEM_Str|MEM_Term;
zP4 = displayP4(pOp, pMem->z, pMem->szMalloc);
if( zP4!=pMem->z ){
pMem->n = 0;
sqlite3VdbeMemSetStr(pMem, zP4, -1, SQLITE_UTF8, 0);
}else{ }else{
assert( pMem->z!=0 ); char *zP4;
pMem->n = sqlite3Strlen30(pMem->z); if( p->explain==1 ){
pMem->enc = SQLITE_UTF8; pMem->flags = MEM_Int;
} pMem->u.i = i; /* Program counter */
pMem++; pMem++;
if( p->explain==1 ){ pMem->flags = MEM_Static|MEM_Str|MEM_Term;
if( sqlite3VdbeMemClearAndResize(pMem, 4) ){ pMem->z = (char*)sqlite3OpcodeName(pOp->opcode); /* Opcode */
assert( p->db->mallocFailed ); assert( pMem->z!=0 );
return SQLITE_ERROR; pMem->n = sqlite3Strlen30(pMem->z);
pMem->enc = SQLITE_UTF8;
pMem++;
} }
pMem->flags = MEM_Str|MEM_Term;
pMem->n = 2; pMem->flags = MEM_Int;
sqlite3_snprintf(3, pMem->z, "%.2x", pOp->p5); /* P5 */ pMem->u.i = pOp->p1; /* P1 */
pMem->enc = SQLITE_UTF8;
pMem++; pMem++;
#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS pMem->flags = MEM_Int;
if( sqlite3VdbeMemClearAndResize(pMem, 500) ){ pMem->u.i = pOp->p2; /* P2 */
pMem++;
pMem->flags = MEM_Int;
pMem->u.i = pOp->p3; /* P3 */
pMem++;
if( sqlite3VdbeMemClearAndResize(pMem, 100) ){ /* P4 */
assert( p->db->mallocFailed ); assert( p->db->mallocFailed );
return SQLITE_ERROR; return SQLITE_ERROR;
} }
pMem->flags = MEM_Str|MEM_Term; pMem->flags = MEM_Str|MEM_Term;
pMem->n = displayComment(pOp, zP4, pMem->z, 500); zP4 = displayP4(pOp, pMem->z, pMem->szMalloc);
pMem->enc = SQLITE_UTF8; if( zP4!=pMem->z ){
#else pMem->n = 0;
pMem->flags = MEM_Null; /* Comment */ sqlite3VdbeMemSetStr(pMem, zP4, -1, SQLITE_UTF8, 0);
#endif }else{
} assert( pMem->z!=0 );
pMem->n = sqlite3Strlen30(pMem->z);
pMem->enc = SQLITE_UTF8;
}
pMem++;
p->nResColumn = 8 - 4*(p->explain-1); if( p->explain==1 ){
p->pResultSet = &p->aMem[1]; if( sqlite3VdbeMemClearAndResize(pMem, 4) ){
p->rc = SQLITE_OK; assert( p->db->mallocFailed );
rc = SQLITE_ROW; return SQLITE_ERROR;
}
pMem->flags = MEM_Str|MEM_Term;
pMem->n = 2;
sqlite3_snprintf(3, pMem->z, "%.2x", pOp->p5); /* P5 */
pMem->enc = SQLITE_UTF8;
pMem++;
#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
if( sqlite3VdbeMemClearAndResize(pMem, 500) ){
assert( p->db->mallocFailed );
return SQLITE_ERROR;
}
pMem->flags = MEM_Str|MEM_Term;
pMem->n = displayComment(pOp, zP4, pMem->z, 500);
pMem->enc = SQLITE_UTF8;
#else
pMem->flags = MEM_Null; /* Comment */
#endif
}
p->nResColumn = 8 - 4*(p->explain-1);
p->pResultSet = &p->aMem[1];
p->rc = SQLITE_OK;
rc = SQLITE_ROW;
}
} }
return rc; return rc;
} }