diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/delete.c | 6 | ||||
| -rw-r--r-- | src/sqliteInt.h | 6 | ||||
| -rw-r--r-- | src/update.c | 5 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/delete.c b/src/delete.c index 64ce044c1..3c288d39a 100644 --- a/src/delete.c +++ b/src/delete.c @@ -12,7 +12,7 @@ ** 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.167 2008/04/11 19:18:25 drh Exp $ +** $Id: delete.c,v 1.168 2008/04/15 14:36:42 drh Exp $ */ #include "sqliteInt.h" @@ -91,7 +91,6 @@ void sqlite3MaterializeView( Parse *pParse, /* Parsing context */ Select *pView, /* View definition */ Expr *pWhere, /* Optional WHERE clause to be added */ - u32 col_mask, /* Render only the columns in this mask. */ int iCur /* Cursor number for ephemerial table */ ){ SelectDest dest; @@ -106,7 +105,6 @@ void sqlite3MaterializeView( pFrom = sqlite3SrcListAppendFromTerm(pParse, 0, 0, 0, 0, pDup, 0, 0); pDup = sqlite3SelectNew(pParse, 0, pFrom, pWhere, 0, 0, 0, 0, 0, 0); } - sqlite3SelectMask(pParse, pDup, col_mask); sqlite3SelectDestInit(&dest, SRT_EphemTab, iCur); sqlite3Select(pParse, pDup, &dest, 0, 0, 0, 0); sqlite3SelectDelete(pDup); @@ -248,7 +246,7 @@ void sqlite3DeleteFrom( ** a ephemeral table. */ if( isView ){ - sqlite3MaterializeView(pParse, pTab->pSelect, pWhere, old_col_mask, iCur); + sqlite3MaterializeView(pParse, pTab->pSelect, pWhere, iCur); } /* Resolve the column names in the WHERE clause. diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 6ff5b1f4b..78abb7de8 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.692 2008/04/15 12:14:22 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.693 2008/04/15 14:36:42 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -1935,7 +1935,7 @@ void sqlite3RegisterDateTimeFunctions(sqlite3*); int sqlite3SafetyCheckOk(sqlite3*); int sqlite3SafetyCheckSickOrOk(sqlite3*); void sqlite3ChangeCookie(Parse*, int); -void sqlite3MaterializeView(Parse*, Select*, Expr*, u32, int); +void sqlite3MaterializeView(Parse*, Select*, Expr*, int); #ifndef SQLITE_OMIT_TRIGGER void sqlite3BeginTrigger(Parse*, Token*,Token*,int,int,IdList*,SrcList*, @@ -1955,14 +1955,12 @@ void sqlite3MaterializeView(Parse*, Select*, Expr*, u32, int); TriggerStep *sqlite3TriggerDeleteStep(sqlite3*,Token*, Expr*); void sqlite3DeleteTrigger(Trigger*); void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*); - void sqlite3SelectMask(Parse *, Select *, u32); #else # define sqlite3TriggersExist(A,B,C,D,E,F) 0 # define sqlite3DeleteTrigger(A) # define sqlite3DropTriggerPtr(A,B) # define sqlite3UnlinkAndDeleteTrigger(A,B,C) # define sqlite3CodeRowTrigger(A,B,C,D,E,F,G,H,I,J,K) 0 -# define sqlite3SelectMask(A, B, C) #endif int sqlite3JoinType(Parse*, Token*, Token*, Token*); diff --git a/src/update.c b/src/update.c index 0d8e61ab6..2a170366a 100644 --- a/src/update.c +++ b/src/update.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle UPDATE statements. ** -** $Id: update.c,v 1.176 2008/04/10 13:33:18 drh Exp $ +** $Id: update.c,v 1.177 2008/04/15 14:36:42 drh Exp $ */ #include "sqliteInt.h" @@ -329,8 +329,7 @@ void sqlite3Update( ** a ephemeral table. */ if( isView ){ - sqlite3MaterializeView(pParse, pTab->pSelect, pWhere, - old_col_mask|new_col_mask, iCur); + sqlite3MaterializeView(pParse, pTab->pSelect, pWhere, iCur); } /* Resolve the column names in all the expressions in the |