Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Get SQLLOG working on windows. Fix a couple of compiler warnings. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | sqllog |
| Files: | files | file ages | folders |
| SHA1: |
b3809c937b230b34e5bc6ce4909c04ce |
| User & Date: | drh 2012-11-27 16:39:31 |
Context
|
2012-11-27
| ||
| 21:22 | Add the SQLLOG capability to trunk. (check-in: f0843f88 user: drh tags: trunk) | |
| 16:39 | Get SQLLOG working on windows. Fix a couple of compiler warnings. (Closed-Leaf check-in: b3809c93 user: drh tags: sqllog) | |
| 10:56 | Fix problems in test_sqllog.c. Clarify the experimental SQLITE_CONFIG_SQLLOG interface. Handle at least the more likely error conditions in test_sqllog.c. (check-in: 429c5b20 user: dan tags: sqllog) | |
Changes
Changes to src/test_sqllog.c.
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 ... 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 ... 462 463 464 465 466 467 468 469 |
#include "stdlib.h"
#include "string.h"
#include "assert.h"
#include "sys/types.h"
#include "unistd.h"
static int getProcessId(void){
return (int)getpid();
}
#define ENVIRONMENT_VARIABLE1_NAME "SQLITE_SQLLOG_DIR"
#define ENVIRONMENT_VARIABLE2_NAME "SQLITE_SQLLOG_REUSE_FILES"
/* Assume that all database and database file names are shorted than this. */
................................................................................
** order that they were attached. So a newly attached database is
** described by the last row returned. */
assert( sqllogglobal.bRec==0 );
sqllogglobal.bRec = 1;
rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
if( rc==SQLITE_OK ){
while( SQLITE_ROW==sqlite3_step(pStmt) ){
char *zVal1; int nVal1;
char *zVal2; int nVal2;
zVal1 = sqlite3_column_text(pStmt, 1);
nVal1 = sqlite3_column_bytes(pStmt, 1);
memcpy(zName, zVal1, nVal1+1);
zVal2 = sqlite3_column_text(pStmt, 2);
nVal2 = sqlite3_column_bytes(pStmt, 2);
memcpy(zFile, zVal2, nVal2+1);
if( zSearch && strlen(zSearch)==nVal1
&& 0==sqlite3_strnicmp(zSearch, zVal1, nVal1)
){
break;
................................................................................
if( getenv(ENVIRONMENT_VARIABLE1_NAME) ){
if( SQLITE_OK==sqlite3_config(SQLITE_CONFIG_SQLLOG, testSqllog, 0) ){
memset(&sqllogglobal, 0, sizeof(sqllogglobal));
sqllogglobal.bReuse = 1;
}
}
}
|
> > > > | | | | < |
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 ... 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 ... 466 467 468 469 470 471 472 |
#include "stdlib.h"
#include "string.h"
#include "assert.h"
#include "sys/types.h"
#include "unistd.h"
static int getProcessId(void){
#if SQLITE_OS_WIN
return (int)_getpid();
#else
return (int)getpid();
#endif
}
#define ENVIRONMENT_VARIABLE1_NAME "SQLITE_SQLLOG_DIR"
#define ENVIRONMENT_VARIABLE2_NAME "SQLITE_SQLLOG_REUSE_FILES"
/* Assume that all database and database file names are shorted than this. */
................................................................................
** order that they were attached. So a newly attached database is
** described by the last row returned. */
assert( sqllogglobal.bRec==0 );
sqllogglobal.bRec = 1;
rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
if( rc==SQLITE_OK ){
while( SQLITE_ROW==sqlite3_step(pStmt) ){
const char *zVal1; int nVal1;
const char *zVal2; int nVal2;
zVal1 = (const char*)sqlite3_column_text(pStmt, 1);
nVal1 = sqlite3_column_bytes(pStmt, 1);
memcpy(zName, zVal1, nVal1+1);
zVal2 = (const char*)sqlite3_column_text(pStmt, 2);
nVal2 = sqlite3_column_bytes(pStmt, 2);
memcpy(zFile, zVal2, nVal2+1);
if( zSearch && strlen(zSearch)==nVal1
&& 0==sqlite3_strnicmp(zSearch, zVal1, nVal1)
){
break;
................................................................................
if( getenv(ENVIRONMENT_VARIABLE1_NAME) ){
if( SQLITE_OK==sqlite3_config(SQLITE_CONFIG_SQLLOG, testSqllog, 0) ){
memset(&sqllogglobal, 0, sizeof(sqllogglobal));
sqllogglobal.bReuse = 1;
}
}
}
|