diff options
| author | shane <shane@noemail.net> | 2008-09-01 21:59:42 +0000 |
|---|---|---|
| committer | shane <shane@noemail.net> | 2008-09-01 21:59:42 +0000 |
| commit | fa4e62f3d882c25504a764b98c33b38fcd078ade (patch) | |
| tree | 9ff895f22922e026636e1815182b779e3f916537 /src | |
| parent | 689aa852cb7436ddefb38bc326f6be01de411fa2 (diff) | |
| download | sqlite-fa4e62f3d882c25504a764b98c33b38fcd078ade.tar.gz sqlite-fa4e62f3d882c25504a764b98c33b38fcd078ade.zip | |
Omit prototype for and calls to sqlite3MaterializeView() if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER). (CVS 5655)
FossilOrigin-Name: 9cf484fc17944ffa14335e391112d82d2390d116
Diffstat (limited to 'src')
| -rw-r--r-- | src/delete.c | 4 | ||||
| -rw-r--r-- | src/sqliteInt.h | 5 | ||||
| -rw-r--r-- | src/update.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/delete.c b/src/delete.c index 4219b8813..cc25c1b72 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.174 2008/08/29 02:14:03 drh Exp $ +** $Id: delete.c,v 1.175 2008/09/01 21:59:43 shane Exp $ */ #include "sqliteInt.h" @@ -249,9 +249,11 @@ void sqlite3DeleteFrom( /* If we are trying to delete from a view, realize that view into ** a ephemeral table. */ +#if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER) if( isView ){ sqlite3MaterializeView(pParse, pTab, pWhere, iCur); } +#endif /* Resolve the column names in the WHERE clause. */ diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 51cdc324d..8b87aa9d2 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.766 2008/09/01 18:34:20 danielk1977 Exp $ +** @(#) $Id: sqliteInt.h,v 1.767 2008/09/01 21:59:43 shane Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -2202,7 +2202,10 @@ int sqlite3GetBuiltinFunction(const char *, int, FuncDef **); int sqlite3SafetyCheckOk(sqlite3*); int sqlite3SafetyCheckSickOrOk(sqlite3*); void sqlite3ChangeCookie(Parse*, int); + +#if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER) void sqlite3MaterializeView(Parse*, Table*, Expr*, int); +#endif #ifndef SQLITE_OMIT_TRIGGER void sqlite3BeginTrigger(Parse*, Token*,Token*,int,int,IdList*,SrcList*, diff --git a/src/update.c b/src/update.c index 97bf93718..3b0845092 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.183 2008/08/22 12:30:52 drh Exp $ +** $Id: update.c,v 1.184 2008/09/01 21:59:43 shane Exp $ */ #include "sqliteInt.h" @@ -328,9 +328,11 @@ void sqlite3Update( /* If we are trying to update a view, realize that view into ** a ephemeral table. */ +#if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER) if( isView ){ sqlite3MaterializeView(pParse, pTab, pWhere, iCur); } +#endif /* Resolve the column names in all the expressions in the ** WHERE clause. |