database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-09-09 21:09:38 +03:00
Code Activity

Fix compiler warnings with MSVC build. (CVS 6699)

Browse Source 
FossilOrigin-Name: 0791588520603d106aa0b8ce24d68b740b7b80c8
This commit is contained in:
shane
2009-06-01 16:53:09 +00:00
parent 739a277031
commit cf6973963a
7 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/resolve.c
View File

@@ -14,7 +14,7 @@
** resolve all identifiers by associating them with a particular
** table and column.
**
** $Id: resolve.c,v 1.27 2009/05/29 14:39:08 drh Exp $
** $Id: resolve.c,v 1.28 2009/06/01 16:53:10 shane Exp $
*/
#include "sqliteInt.h"
#include <stdlib.h>
@@ -190,7 +190,7 @@ static int lookupName(
pMatch = pItem;
pSchema = pTab->pSchema;
/* Substitute the rowid (column -1) for the INTEGER PRIMARY KEY */
pExpr->iColumn = j==pTab->iPKey ? -1 : j;
pExpr->iColumn = j==pTab->iPKey ? -1 : (i16)j;
if( i<pSrcList->nSrc-1 ){
if( pItem[1].jointype & JT_NATURAL ){
/* If this match occurred in the left table of a natural join,
@@ -246,7 +246,7 @@ static int lookupName(
for(iCol=0; iCol < pTab->nCol; iCol++, pCol++) {
if( sqlite3StrICmp(pCol->zName, zCol)==0 ){
cnt++;
pExpr->iColumn = iCol==pTab->iPKey ? -1 : iCol;
pExpr->iColumn = iCol==pTab->iPKey ? -1 : (i16)iCol;
pExpr->pTab = pTab;
if( iCol>=0 ){
testcase( iCol==31 );
@@ -591,6 +591,8 @@ static int resolveAsName(
){
int i; /* Loop counter */
UNUSED_PARAMETER(pParse);
if( pE->op==TK_ID || (pE->op==TK_STRING && pE->u.zToken[0]!='\'') ){
char *zCol = pE->u.zToken;
for(i=0; i<pEList->nExpr; i++){