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

Minor bug fixes and enhancements to the pragma eponymous virtual tables.

Browse Source 
FossilOrigin-Name: 3f8f461504139a4efea0e033e3a274cc4b2d3072
This commit is contained in:
drh 2016-12-16 02:14:15 +00:00
parent c06bbceb9c
commit 9a63f09204
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Merge\senhancements\sfrom\strunk,\sand\sespecially\sthe\sability\sto\suse\ntemp.sqlite_master\sas\san\salias\sfor\ssqlite_temp_master. C Minor\sbug\sfixes\sand\senhancements\sto\sthe\spragma\seponymous\svirtual\stables.
D 2016-12-16T01:09:22.413 D 2016-12-16T02:14:15.843
F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8 F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@ -381,7 +381,7 @@ F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953 F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
F src/pragma.c 41f18267db44df49756c3c3cdc695e701e169a63 F src/pragma.c 767a41128464e8dfb8a86449bdd0ce8ad57c7420
F src/pragma.h f9b221b2c8949ea941dbee49934299e4ed5af41c F src/pragma.h f9b221b2c8949ea941dbee49934299e4ed5af41c
F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1 F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1
@ -464,7 +464,7 @@ F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
F src/vdbemem.c d3fd85b7b7ef3eb75de29c6d7e1d10d3ca78b4fd F src/vdbemem.c d3fd85b7b7ef3eb75de29c6d7e1d10d3ca78b4fd
F src/vdbesort.c bb34eed4fb52e11ac037dccea4ee3190594c7f9e F src/vdbesort.c bb34eed4fb52e11ac037dccea4ee3190594c7f9e
F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834 F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
F src/vtab.c 104907646940e597f60debb42e7e0981b276dcaa F src/vtab.c c4bbe0f870f52036553f8098aee0703997f0577a
F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344 F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71 F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
@ -1536,7 +1536,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 7126807a186746a8663fbaa267d63214d06476e4 8d646905b830d5bb29092e103ac5cb499b3c7e5a P 994a4401f5c34fed17af420761291b03072a5ea1
R c03b90088a1e080799e09d2f075e1354 R afd4feda84f0d8c4e20e6eee8d9eee4f
U drh U drh
Z 3b955bd6345f72aad83fc556ff64eb52 Z 47dbd97e4f7c38d810ba53087789cc3e

2
manifest.uuid
View File

@ -1 +1 @@
994a4401f5c34fed17af420761291b03072a5ea1 3f8f461504139a4efea0e033e3a274cc4b2d3072

18
src/pragma.c
View File

@ -2002,6 +2002,11 @@ static int pragmaVtabConnect(
sqlite3XPrintf(&acc, "%c\"%s\"", cSep, pragCName[j]); sqlite3XPrintf(&acc, "%c\"%s\"", cSep, pragCName[j]);
cSep = ','; cSep = ',';
} }
if( i==0 ){
sqlite3XPrintf(&acc, "(\"%s\"", pPragma->zName);
cSep = ',';
i++;
}
j = 0; j = 0;
if( pPragma->mPragFlg & PragFlg_Result1 ){ if( pPragma->mPragFlg & PragFlg_Result1 ){
sqlite3StrAccumAppendAll(&acc, ",arg HIDDEN"); sqlite3StrAccumAppendAll(&acc, ",arg HIDDEN");
@ -2067,7 +2072,6 @@ static int pragmaVtabBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
if( pConstraint->iColumn < pTab->iHidden ) continue; if( pConstraint->iColumn < pTab->iHidden ) continue;
j = pConstraint->iColumn - pTab->iHidden; j = pConstraint->iColumn - pTab->iHidden;
assert( j < 2 ); assert( j < 2 );
if( seen[j] ) continue;
seen[j] = i+1; seen[j] = i+1;
} }
if( seen[0]==0 ){ if( seen[0]==0 ){
@ -2113,6 +2117,7 @@ static void pragmaVtabCursorClear(PragmaVtabCursor *pCsr){
static int pragmaVtabClose(sqlite3_vtab_cursor *cur){ static int pragmaVtabClose(sqlite3_vtab_cursor *cur){
PragmaVtabCursor *pCsr = (PragmaVtabCursor*)cur; PragmaVtabCursor *pCsr = (PragmaVtabCursor*)cur;
pragmaVtabCursorClear(pCsr); pragmaVtabCursorClear(pCsr);
sqlite3_free(pCsr);
return SQLITE_OK; return SQLITE_OK;
} }
@ -2123,12 +2128,11 @@ static int pragmaVtabNext(sqlite3_vtab_cursor *pVtabCursor){
/* Increment the xRowid value */ /* Increment the xRowid value */
pCsr->iRowid++; pCsr->iRowid++;
if( pCsr->pPragma ){ assert( pCsr->pPragma );
if( SQLITE_ROW!=sqlite3_step(pCsr->pPragma) ){ if( SQLITE_ROW!=sqlite3_step(pCsr->pPragma) ){
rc = sqlite3_finalize(pCsr->pPragma); rc = sqlite3_finalize(pCsr->pPragma);
pCsr->pPragma = 0; pCsr->pPragma = 0;
pragmaVtabCursorClear(pCsr); pragmaVtabCursorClear(pCsr);
}
} }
return rc; return rc;
} }

1
src/vtab.c
View File

@ -57,6 +57,7 @@ Module *sqlite3VtabCreateModule(
if( pDel ){ if( pDel ){
sqlite3OomFault(db); sqlite3OomFault(db);
sqlite3DbFree(db, pDel); sqlite3DbFree(db, pDel);
pMod = 0;
} }
} }
return pMod; return pMod;