Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Removed compiler warnings from MSVC builds. Ticket #3701. (CVS 6335) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5477833ec7f707ea9937d3fd6a6d8ab4 |
User & Date: | shane 2009-03-05 03:48:07.000 |
Context
2009-03-05
| ||
04:20 | Corrected typos and misspellings. Ticket #3702. (CVS 6336) (check-in: 6404afa0c5 user: shane tags: trunk) | |
03:48 | Removed compiler warnings from MSVC builds. Ticket #3701. (CVS 6335) (check-in: 5477833ec7 user: shane tags: trunk) | |
2009-03-02
| ||
17:18 | Converted EXPR_*SIZE macros to use offsetof() to avoid MSVC compiler warnings. (CVS 6334) (check-in: 5e8e16f7d5 user: shane tags: trunk) | |
Changes
Changes to src/delete.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** in order to generate code for DELETE FROM statements. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** in order to generate code for DELETE FROM statements. ** ** $Id: delete.c,v 1.198 2009/03/05 03:48:07 shane Exp $ */ #include "sqliteInt.h" /* ** Look up every table that is named in pSrc. If any table is not found, ** add an error message to pParse->zErrMsg and return NULL. If all tables ** are found, return a pointer to the last table. |
︙ | ︙ | |||
74 75 76 77 78 79 80 | ){ Vdbe *v; if( IsVirtual(pTab) ) return; v = sqlite3GetVdbe(p); assert( opcode==OP_OpenWrite || opcode==OP_OpenRead ); sqlite3TableLock(p, iDb, pTab->tnum, (opcode==OP_OpenWrite)?1:0, pTab->zName); sqlite3VdbeAddOp3(v, opcode, iCur, pTab->tnum, iDb); | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | ){ Vdbe *v; if( IsVirtual(pTab) ) return; v = sqlite3GetVdbe(p); assert( opcode==OP_OpenWrite || opcode==OP_OpenRead ); sqlite3TableLock(p, iDb, pTab->tnum, (opcode==OP_OpenWrite)?1:0, pTab->zName); sqlite3VdbeAddOp3(v, opcode, iCur, pTab->tnum, iDb); sqlite3VdbeChangeP4(v, -1, SQLITE_INT_TO_PTR(pTab->nCol), P4_INT32); VdbeComment((v, "%s", pTab->zName)); } #if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER) /* ** Evaluate a view and store its result in an ephemeral table. The |
︙ | ︙ |
Changes to src/expr.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** ** $Id: expr.c,v 1.417 2009/03/05 03:48:07 shane Exp $ */ #include "sqliteInt.h" /* ** Return the 'affinity' of the expression pExpr if any. ** ** If pExpr is a column, a reference to a column via an 'AS' alias, |
︙ | ︙ | |||
490 491 492 493 494 495 496 | ** at the same string. */ void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){ assert( pRight!=0 ); assert( pLeft!=0 ); if( pExpr ){ pExpr->span.z = pLeft->z; | > | | 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 | ** at the same string. */ void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){ assert( pRight!=0 ); assert( pLeft!=0 ); if( pExpr ){ pExpr->span.z = pLeft->z; assert(pRight->z >= pLeft->z); pExpr->span.n = pRight->n + (unsigned)(pRight->z - pLeft->z); } } /* ** Construct a new expression node for a function with multiple ** arguments. */ |
︙ | ︙ |
Changes to src/parse.y.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** This file contains SQLite's grammar for SQL. Process this file ** using the lemon parser generator to generate C code that runs ** the parser. Lemon will also generate a header file containing ** numeric codes for all of the tokens. ** | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** This file contains SQLite's grammar for SQL. Process this file ** using the lemon parser generator to generate C code that runs ** the parser. Lemon will also generate a header file containing ** numeric codes for all of the tokens. ** ** @(#) $Id: parse.y,v 1.270 2009/03/05 03:48:07 shane Exp $ */ // All token codes are small integers with #defines that begin with "TK_" %token_prefix TK_ // The type of the data attached to each token is Token. This is also the // default type for non-terminals. |
︙ | ︙ | |||
1107 1108 1109 1110 1111 1112 1113 | A->affinity = OE_Ignore; sqlite3ExprSpan(A, &X, &Y); } } expr(A) ::= RAISE(X) LP raisetype(T) COMMA nm(Z) RP(Y). { A = sqlite3PExpr(pParse, TK_RAISE, 0, 0, &Z); if( A ) { | | | 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 | A->affinity = OE_Ignore; sqlite3ExprSpan(A, &X, &Y); } } expr(A) ::= RAISE(X) LP raisetype(T) COMMA nm(Z) RP(Y). { A = sqlite3PExpr(pParse, TK_RAISE, 0, 0, &Z); if( A ) { A->affinity = (char)T; sqlite3ExprSpan(A, &X, &Y); } } %endif !SQLITE_OMIT_TRIGGER %type raisetype {int} raisetype(A) ::= ROLLBACK. {A = OE_Rollback;} |
︙ | ︙ |
Changes to src/shell.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.205 2009/03/05 03:48:07 shane Exp $ */ #if defined(_WIN32) || defined(WIN32) /* This needs to come before any includes for MSVC compiler */ #define _CRT_SECURE_NO_WARNINGS #endif #include <stdlib.h> |
︙ | ︙ | |||
111 112 113 114 115 116 117 118 119 120 121 122 123 124 | #define HAS_TIMER 1 #else #define BEGIN_TIMER #define END_TIMER #define HAS_TIMER 0 #endif /************************************************************************** *************************************************************************** ** Begin genfkey logic. */ #if !defined(SQLITE_OMIT_VIRTUALTABLE) && !defined SQLITE_OMIT_SUBQUERY | > > > > > | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | #define HAS_TIMER 1 #else #define BEGIN_TIMER #define END_TIMER #define HAS_TIMER 0 #endif /* ** Used to prevent warnings about unused parameters */ #define UNUSED_PARAMETER(x) (void)(x) /************************************************************************** *************************************************************************** ** Begin genfkey logic. */ #if !defined(SQLITE_OMIT_VIRTUALTABLE) && !defined SQLITE_OMIT_SUBQUERY |
︙ | ︙ | |||
243 244 245 246 247 248 249 250 251 252 253 254 255 256 | sqlite3_vtab **ppVtab, char **pzErr ){ int rc = SQLITE_NOMEM; schema_vtab *pVtab; SchemaTable *pType = &aSchemaTable[0]; if( argc>3 ){ int i; pType = 0; for(i=0; aSchemaTable[i].zName; i++){ if( 0==strcmp(argv[3], aSchemaTable[i].zName) ){ pType = &aSchemaTable[i]; } | > > | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | sqlite3_vtab **ppVtab, char **pzErr ){ int rc = SQLITE_NOMEM; schema_vtab *pVtab; SchemaTable *pType = &aSchemaTable[0]; UNUSED_PARAMETER(pzErr); if( argc>3 ){ int i; pType = 0; for(i=0; aSchemaTable[i].zName; i++){ if( 0==strcmp(argv[3], aSchemaTable[i].zName) ){ pType = &aSchemaTable[i]; } |
︙ | ︙ | |||
273 274 275 276 277 278 279 280 281 282 283 284 285 286 | /* ** Open a new cursor on the schema table. */ static int schemaOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){ int rc = SQLITE_NOMEM; schema_cursor *pCur; pCur = sqlite3_malloc(sizeof(schema_cursor)); if( pCur ){ memset(pCur, 0, sizeof(schema_cursor)); *ppCursor = (sqlite3_vtab_cursor *)pCur; rc = SQLITE_OK; } return rc; | > | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | /* ** Open a new cursor on the schema table. */ static int schemaOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){ int rc = SQLITE_NOMEM; schema_cursor *pCur; UNUSED_PARAMETER(pVTab); pCur = sqlite3_malloc(sizeof(schema_cursor)); if( pCur ){ memset(pCur, 0, sizeof(schema_cursor)); *ppCursor = (sqlite3_vtab_cursor *)pCur; rc = SQLITE_OK; } return rc; |
︙ | ︙ | |||
435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 | sqlite3_vtab_cursor *pVtabCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ int rc; schema_vtab *pVtab = (schema_vtab *)(pVtabCursor->pVtab); schema_cursor *pCur = (schema_cursor *)pVtabCursor; pCur->rowid = 0; finalize(&pCur->pTableList); finalize(&pCur->pColumnList); finalize(&pCur->pDbList); rc = sqlite3_prepare(pVtab->db,"SELECT 0, 'main'", -1, &pCur->pDbList, 0); return (rc==SQLITE_OK ? schemaNext(pVtabCursor) : rc); } /* ** Analyse the WHERE condition. */ static int schemaBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ return SQLITE_OK; } /* ** A virtual table module that merely echos method calls into TCL ** variables. */ | > > > > > > | 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | sqlite3_vtab_cursor *pVtabCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ int rc; schema_vtab *pVtab = (schema_vtab *)(pVtabCursor->pVtab); schema_cursor *pCur = (schema_cursor *)pVtabCursor; UNUSED_PARAMETER(idxNum); UNUSED_PARAMETER(idxStr); UNUSED_PARAMETER(argc); UNUSED_PARAMETER(argv); pCur->rowid = 0; finalize(&pCur->pTableList); finalize(&pCur->pColumnList); finalize(&pCur->pDbList); rc = sqlite3_prepare(pVtab->db,"SELECT 0, 'main'", -1, &pCur->pDbList, 0); return (rc==SQLITE_OK ? schemaNext(pVtabCursor) : rc); } /* ** Analyse the WHERE condition. */ static int schemaBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ UNUSED_PARAMETER(tab); UNUSED_PARAMETER(pIdxInfo); return SQLITE_OK; } /* ** A virtual table module that merely echos method calls into TCL ** variables. */ |
︙ | ︙ | |||
524 525 526 527 528 529 530 531 532 533 534 535 536 537 | } static void joinStep( sqlite3_context *context, int argc, sqlite3_value **argv ){ StrBuffer *p; p = (StrBuffer *)sqlite3_aggregate_context(context, sizeof(StrBuffer)); if( p->zBuf==0 ){ p->zBuf = sqlite3_mprintf("%s", sqlite3_value_text(argv[0])); }else{ char *zTmp = p->zBuf; p->zBuf = sqlite3_mprintf("%s%s%s", zTmp, sqlite3_value_text(argv[1]), sqlite3_value_text(argv[0]) | > | 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 | } static void joinStep( sqlite3_context *context, int argc, sqlite3_value **argv ){ StrBuffer *p; UNUSED_PARAMETER(argc); p = (StrBuffer *)sqlite3_aggregate_context(context, sizeof(StrBuffer)); if( p->zBuf==0 ){ p->zBuf = sqlite3_mprintf("%s", sqlite3_value_text(argv[0])); }else{ char *zTmp = p->zBuf; p->zBuf = sqlite3_mprintf("%s%s%s", zTmp, sqlite3_value_text(argv[1]), sqlite3_value_text(argv[0]) |
︙ | ︙ | |||
556 557 558 559 560 561 562 563 564 565 566 567 568 569 | sqlite3_value **argv ){ int ii; char *zOut; char *zCsr; const char *zIn = (const char *)sqlite3_value_text(argv[0]); int nIn = sqlite3_value_bytes(argv[0]); zOut = sqlite3_malloc(nIn*2+3); zCsr = zOut; *zCsr++ = '"'; for(ii=0; ii<nIn; ii++){ *zCsr++ = zIn[ii]; if( zIn[ii]=='"' ){ | > > | 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 | sqlite3_value **argv ){ int ii; char *zOut; char *zCsr; const char *zIn = (const char *)sqlite3_value_text(argv[0]); int nIn = sqlite3_value_bytes(argv[0]); UNUSED_PARAMETER(argc); zOut = sqlite3_malloc(nIn*2+3); zCsr = zOut; *zCsr++ = '"'; for(ii=0; ii<nIn; ii++){ *zCsr++ = zIn[ii]; if( zIn[ii]=='"' ){ |
︙ | ︙ | |||
622 623 624 625 626 627 628 629 630 631 632 633 634 635 | /* ** A callback for sqlite3_exec() invokes the callback specified by the ** GenfkeyCb structure pointed to by the void* passed as the first argument. */ static int invokeCallback(void *p, int nArg, char **azArg, char **azCol){ GenfkeyCb *pCb = (GenfkeyCb *)p; return pCb->xData(pCb->pCtx, pCb->eType, azArg[0]); } int detectSchemaProblem( sqlite3 *db, /* Database connection */ const char *zMessage, /* English language error message */ const char *zSql, /* SQL statement to run */ | > > | 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 | /* ** A callback for sqlite3_exec() invokes the callback specified by the ** GenfkeyCb structure pointed to by the void* passed as the first argument. */ static int invokeCallback(void *p, int nArg, char **azArg, char **azCol){ GenfkeyCb *pCb = (GenfkeyCb *)p; UNUSED_PARAMETER(nArg); UNUSED_PARAMETER(azCol); return pCb->xData(pCb->pCtx, pCb->eType, azArg[0]); } int detectSchemaProblem( sqlite3 *db, /* Database connection */ const char *zMessage, /* English language error message */ const char *zSql, /* SQL statement to run */ |
︙ | ︙ | |||
903 904 905 906 907 908 909 910 911 912 913 914 915 916 | int rc; const int enc = SQLITE_UTF8; sqlite3 *db = 0; GenfkeyCb cb; cb.xData = xData; cb.pCtx = pCtx; /* Open the working database handle. */ rc = sqlite3_open(":memory:", &db); if( rc!=SQLITE_OK ) goto genfkey_exit; /* Create the special scalar and aggregate functions used by this program. */ sqlite3_create_function(db, "dq", 1, enc, 0, doublequote, 0, 0); | > > | 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 | int rc; const int enc = SQLITE_UTF8; sqlite3 *db = 0; GenfkeyCb cb; cb.xData = xData; cb.pCtx = pCtx; UNUSED_PARAMETER(zDb); /* Open the working database handle. */ rc = sqlite3_open(":memory:", &db); if( rc!=SQLITE_OK ) goto genfkey_exit; /* Create the special scalar and aggregate functions used by this program. */ sqlite3_create_function(db, "dq", 1, enc, 0, doublequote, 0, 0); |
︙ | ︙ | |||
951 952 953 954 955 956 957 | #endif /* End genfkey logic. */ /*************************************************************************/ /*************************************************************************/ | < < < < < | 972 973 974 975 976 977 978 979 980 981 982 983 984 985 | #endif /* End genfkey logic. */ /*************************************************************************/ /*************************************************************************/ /* ** If the following flag is set, then command execution stops ** at an error if we are not interactive. */ static int bail_on_error = 0; /* |
︙ | ︙ | |||
1779 1780 1781 1782 1783 1784 1785 | typedef struct GenfkeyCmd GenfkeyCmd; static int genfkeyParseArgs(GenfkeyCmd *p, char **azArg, int nArg){ int ii; memset(p, 0, sizeof(GenfkeyCmd)); for(ii=0; ii<nArg; ii++){ | | | 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 | typedef struct GenfkeyCmd GenfkeyCmd; static int genfkeyParseArgs(GenfkeyCmd *p, char **azArg, int nArg){ int ii; memset(p, 0, sizeof(GenfkeyCmd)); for(ii=0; ii<nArg; ii++){ size_t n = strlen(azArg[ii]); if( n>2 && n<10 && 0==strncmp(azArg[ii], "--no-drop", n) ){ p->isNoDrop = 1; }else if( n>2 && n<16 && 0==strncmp(azArg[ii], "--ignore-errors", n) ){ p->isIgnoreErrors = 1; }else if( n>2 && n<7 && 0==strncmp(azArg[ii], "--exec", n) ){ p->isExec = 1; |
︙ | ︙ |
Changes to src/vdbeaux.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** This file contains code used for creating, destroying, and populating ** a VDBE (or an "sqlite3_stmt" as it is known to the outside world.) Prior ** to version 2.8.7, all this code was combined into the vdbe.c source file. ** But that file was getting too big so this subroutines were split out. ** | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** This file contains code used for creating, destroying, and populating ** a VDBE (or an "sqlite3_stmt" as it is known to the outside world.) Prior ** to version 2.8.7, all this code was combined into the vdbe.c source file. ** But that file was getting too big so this subroutines were split out. ** ** $Id: vdbeaux.c,v 1.440 2009/03/05 03:48:07 shane Exp $ */ #include "sqliteInt.h" #include "vdbeInt.h" /* |
︙ | ︙ | |||
55 56 57 58 59 60 61 | void sqlite3VdbeSetSql(Vdbe *p, const char *z, int n, int isPrepareV2){ if( p==0 ) return; #ifdef SQLITE_OMIT_TRACE if( !isPrepareV2 ) return; #endif assert( p->zSql==0 ); p->zSql = sqlite3DbStrNDup(p->db, z, n); | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | void sqlite3VdbeSetSql(Vdbe *p, const char *z, int n, int isPrepareV2){ if( p==0 ) return; #ifdef SQLITE_OMIT_TRACE if( !isPrepareV2 ) return; #endif assert( p->zSql==0 ); p->zSql = sqlite3DbStrNDup(p->db, z, n); p->isPrepareV2 = isPrepareV2 ? 1 : 0; } /* ** Return the SQL associated with a prepared statement */ const char *sqlite3_sql(sqlite3_stmt *pStmt){ Vdbe *p = (Vdbe *)pStmt; |
︙ | ︙ |
Changes to src/vdbeblob.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** This file contains code used to implement incremental BLOB I/O. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** This file contains code used to implement incremental BLOB I/O. ** ** $Id: vdbeblob.c,v 1.29 2009/03/05 03:48:07 shane Exp $ */ #include "sqliteInt.h" #include "vdbeInt.h" #ifndef SQLITE_OMIT_INCRBLOB |
︙ | ︙ | |||
183 184 185 186 187 188 189 | /* Configure the number of columns. Configure the cursor to ** think that the table has one more column than it really ** does. An OP_Column to retrieve this imaginary column will ** always return an SQL NULL. This is useful because it means ** we can invoke OP_Column to fill in the vdbe cursors type ** and offset cache without causing any IO. */ | | | 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 | /* Configure the number of columns. Configure the cursor to ** think that the table has one more column than it really ** does. An OP_Column to retrieve this imaginary column will ** always return an SQL NULL. This is useful because it means ** we can invoke OP_Column to fill in the vdbe cursors type ** and offset cache without causing any IO. */ sqlite3VdbeChangeP4(v, flags ? 3 : 2, SQLITE_INT_TO_PTR(pTab->nCol+1), P4_INT32); sqlite3VdbeChangeP2(v, 6, pTab->nCol); if( !db->mallocFailed ){ sqlite3VdbeMakeReady(v, 1, 1, 1, 0); } } sqlite3BtreeLeaveAll(db); |
︙ | ︙ |
Changes to src/where.c.
︙ | ︙ | |||
12 13 14 15 16 17 18 | ** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. This module is responsible for ** generating the code that loops through a table looking for applicable ** rows. Indices are selected and used to speed the search when doing ** so is applicable. Because this module is responsible for selecting ** indices, you might also think of this module as the "query optimizer". ** | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | ** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. This module is responsible for ** generating the code that loops through a table looking for applicable ** rows. Indices are selected and used to speed the search when doing ** so is applicable. Because this module is responsible for selecting ** indices, you might also think of this module as the "query optimizer". ** ** $Id: where.c,v 1.374 2009/03/05 03:48:07 shane Exp $ */ #include "sqliteInt.h" /* ** Trace output macros */ #if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) |
︙ | ︙ | |||
3252 3253 3254 3255 3256 3257 3258 | && (wctrlFlags & WHERE_OMIT_OPEN)==0 ){ int op = pWInfo->okOnePass ? OP_OpenWrite : OP_OpenRead; sqlite3OpenTable(pParse, pTabItem->iCursor, iDb, pTab, op); if( !pWInfo->okOnePass && pTab->nCol<BMS ){ Bitmask b = pTabItem->colUsed; int n = 0; for(; b; b=b>>1, n++){} | | | 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 | && (wctrlFlags & WHERE_OMIT_OPEN)==0 ){ int op = pWInfo->okOnePass ? OP_OpenWrite : OP_OpenRead; sqlite3OpenTable(pParse, pTabItem->iCursor, iDb, pTab, op); if( !pWInfo->okOnePass && pTab->nCol<BMS ){ Bitmask b = pTabItem->colUsed; int n = 0; for(; b; b=b>>1, n++){} sqlite3VdbeChangeP4(v, sqlite3VdbeCurrentAddr(v)-1, SQLITE_INT_TO_PTR(n), P4_INT32); assert( n<=pTab->nCol ); } }else{ sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName); } pLevel->iTabCur = pTabItem->iCursor; if( (pLevel->plan.wsFlags & WHERE_INDEXED)!=0 ){ |
︙ | ︙ |