database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-05 04:30:38 +03:00
Code Activity

Merge recent enhancements from trunk.

Browse Source 
FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8
This commit is contained in:
drh
2015-12-02 20:40:26 +00:00
parent 769dc6e2a2 f7ce4291a9
commit 1bb15fc973
72 changed files with 2424 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/shell.c
View File

@@ -1867,6 +1867,7 @@ static char zHelp[] =
".timeout MS Try opening locked tables for MS milliseconds\n"
".timer on|off Turn SQL timer on or off\n"
".trace FILE|off Output each SQL statement as it is run\n"
".vfsinfo ?AUX? Information about the top-level VFS\n"
".vfsname ?AUX? Print the name of the VFS stack\n"
".width NUM1 NUM2 ... Set column widths for \"column\" mode\n"
" Negative values right-justify\n"
@@ -4348,6 +4349,20 @@ static int do_meta_command(char *zLine, ShellState *p){
sqlite3_libversion(), sqlite3_sourceid());
}else
if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){
const char *zDbName = nArg==2 ? azArg[1] : "main";
sqlite3_vfs *pVfs;
if( p->db ){
sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFS_POINTER, &pVfs);
if( pVfs ){
fprintf(p->out, "vfs.zName = \"%s\"\n", pVfs->zName);
fprintf(p->out, "vfs.iVersion = %d\n", pVfs->iVersion);
fprintf(p->out, "vfs.szOsFile = %d\n", pVfs->szOsFile);
fprintf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
}
}
}else
if( c=='v' && strncmp(azArg[0], "vfsname", n)==0 ){
const char *zDbName = nArg==2 ? azArg[1] : "main";
char *zVfsName = 0;