Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Suppress harmless compiler warnings in union-vtab. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: | 4d147a1e28b93e267889fcb01b538d6a |
| User & Date: | drh 2017-07-18 20:22:12 |
Context
|
2017-07-18
| ||
| 20:28 | Fix another harmless compiler warning. Get the MSVC makefile working with unionvtab. check-in: d49639c2 user: drh tags: trunk | |
| 20:22 | Suppress harmless compiler warnings in union-vtab. check-in: 4d147a1e user: drh tags: trunk | |
| 20:17 | Remove an unused variable from unionvtab.c. check-in: a447fdf1 user: dan tags: trunk | |
Changes
Changes to ext/misc/unionvtab.c.
402 403 404 405 406 407 408 409 410 411 412 413 414 415 ... 506 507 508 509 510 511 512 513 514 515 516 517 518 519 ... 595 596 597 598 599 600 601 602 603 604 605 606 607 608 ... 780 781 782 783 784 785 786 787 788 789 790 791 792 793 ... 797 798 799 800 801 802 803 804 805 806 807 808 809 |
int argc, const char *const*argv,
sqlite3_vtab **ppVtab,
char **pzErr
){
UnionTab *pTab = 0;
int rc = SQLITE_OK;
if( sqlite3_stricmp("temp", argv[1]) ){
/* unionvtab tables may only be created in the temp schema */
*pzErr = sqlite3_mprintf("unionvtab tables must be created in TEMP schema");
rc = SQLITE_ERROR;
}else if( argc!=4 ){
*pzErr = sqlite3_mprintf("wrong number of arguments for unionvtab");
rc = SQLITE_ERROR;
................................................................................
/*
** xOpen
*/
static int unionOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
UnionCsr *pCsr;
int rc = SQLITE_OK;
pCsr = (UnionCsr*)unionMalloc(&rc, sizeof(UnionCsr));
*ppCursor = &pCsr->base;
return rc;
}
/*
** xClose
................................................................................
|| idxNum==SQLITE_INDEX_CONSTRAINT_LE
|| idxNum==SQLITE_INDEX_CONSTRAINT_GE
|| idxNum==SQLITE_INDEX_CONSTRAINT_LT
|| idxNum==SQLITE_INDEX_CONSTRAINT_GT
|| idxNum==(SQLITE_INDEX_CONSTRAINT_GE|SQLITE_INDEX_CONSTRAINT_LE)
);
if( idxNum==SQLITE_INDEX_CONSTRAINT_EQ ){
assert( argc==1 );
iMin = iMax = sqlite3_value_int64(argv[0]);
}else{
if( idxNum & (SQLITE_INDEX_CONSTRAINT_LE|SQLITE_INDEX_CONSTRAINT_LT) ){
assert( argc>=1 );
................................................................................
0, /* xUpdate */
0, /* xBegin */
0, /* xSync */
0, /* xCommit */
0, /* xRollback */
0, /* xFindMethod */
0, /* xRename */
};
return sqlite3_create_module(db, "unionvtab", &unionModule, 0);
}
#endif /* SQLITE_OMIT_VIRTUALTABLE */
................................................................................
int sqlite3_unionvtab_init(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
){
int rc = SQLITE_OK;
SQLITE_EXTENSION_INIT2(pApi);
#ifndef SQLITE_OMIT_VIRTUALTABLE
rc = createUnionVtab(db);
#endif
return rc;
}
|
> > > > > > > > < |
402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 ... 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 ... 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 ... 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 ... 804 805 806 807 808 809 810 811 812 813 814 815 816 |
int argc, const char *const*argv,
sqlite3_vtab **ppVtab,
char **pzErr
){
UnionTab *pTab = 0;
int rc = SQLITE_OK;
(void)pAux; /* Suppress harmless 'unused parameter' warning */
if( sqlite3_stricmp("temp", argv[1]) ){
/* unionvtab tables may only be created in the temp schema */
*pzErr = sqlite3_mprintf("unionvtab tables must be created in TEMP schema");
rc = SQLITE_ERROR;
}else if( argc!=4 ){
*pzErr = sqlite3_mprintf("wrong number of arguments for unionvtab");
rc = SQLITE_ERROR;
................................................................................
/*
** xOpen
*/
static int unionOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
UnionCsr *pCsr;
int rc = SQLITE_OK;
(void)p; /* Suppress harmless warning */
pCsr = (UnionCsr*)unionMalloc(&rc, sizeof(UnionCsr));
*ppCursor = &pCsr->base;
return rc;
}
/*
** xClose
................................................................................
|| idxNum==SQLITE_INDEX_CONSTRAINT_LE
|| idxNum==SQLITE_INDEX_CONSTRAINT_GE
|| idxNum==SQLITE_INDEX_CONSTRAINT_LT
|| idxNum==SQLITE_INDEX_CONSTRAINT_GT
|| idxNum==(SQLITE_INDEX_CONSTRAINT_GE|SQLITE_INDEX_CONSTRAINT_LE)
);
(void)idxStr; /* Suppress harmless warning */
if( idxNum==SQLITE_INDEX_CONSTRAINT_EQ ){
assert( argc==1 );
iMin = iMax = sqlite3_value_int64(argv[0]);
}else{
if( idxNum & (SQLITE_INDEX_CONSTRAINT_LE|SQLITE_INDEX_CONSTRAINT_LT) ){
assert( argc>=1 );
................................................................................
0, /* xUpdate */
0, /* xBegin */
0, /* xSync */
0, /* xCommit */
0, /* xRollback */
0, /* xFindMethod */
0, /* xRename */
0, /* xSavepoint */
0, /* xRelease */
0 /* xRollbackTo */
};
return sqlite3_create_module(db, "unionvtab", &unionModule, 0);
}
#endif /* SQLITE_OMIT_VIRTUALTABLE */
................................................................................
int sqlite3_unionvtab_init(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
){
int rc = SQLITE_OK;
SQLITE_EXTENSION_INIT2(pApi);
(void)pzErrMsg; /* Suppress harmless warning */
#ifndef SQLITE_OMIT_VIRTUALTABLE
rc = createUnionVtab(db);
#endif
return rc;
}
|