diff options
author | drh <drh@noemail.net> | 2009-05-28 01:00:55 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2009-05-28 01:00:55 +0000 |
commit | 33e619fc1c938c1cee5f390671f12d70ffb203dd (patch) | |
tree | 154221bcd11ffa6405e6fa5b5b396f141fe63a67 /src/attach.c | |
parent | b7916a78ff7708161b6e2de54af5aea85a07c543 (diff) | |
download | sqlite-33e619fc1c938c1cee5f390671f12d70ffb203dd.tar.gz sqlite-33e619fc1c938c1cee5f390671f12d70ffb203dd.zip |
Additional refinements to Expr handling. Restore compression of trigger
expressions. Change Expr.zToken to Expr.u.zToken and added Expr.u.iValue.
Remove an unnecessary ExprDup from CHECK constraint processing. And so forth. (CVS 6682)
FossilOrigin-Name: 4ac2bdfbb4230b6ceaae87e738fa61036bbe03cb
Diffstat (limited to 'src/attach.c')
-rw-r--r-- | src/attach.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/attach.c b/src/attach.c index 2b5ddb589..9af765973 100644 --- a/src/attach.c +++ b/src/attach.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the ATTACH and DETACH commands. ** -** $Id: attach.c,v 1.91 2009/05/27 10:31:29 drh Exp $ +** $Id: attach.c,v 1.92 2009/05/28 01:00:55 drh Exp $ */ #include "sqliteInt.h" @@ -41,7 +41,7 @@ static int resolveAttachExpr(NameContext *pName, Expr *pExpr) if( pExpr->op!=TK_ID ){ rc = sqlite3ResolveExprNames(pName, pExpr); if( rc==SQLITE_OK && !sqlite3ExprIsConstant(pExpr) ){ - sqlite3ErrorMsg(pName->pParse, "invalid name: \"%s\"", pExpr->zToken); + sqlite3ErrorMsg(pName->pParse, "invalid name: \"%s\"", pExpr->u.zToken); return SQLITE_ERROR; } }else{ @@ -312,7 +312,7 @@ static void codeAttach( #ifndef SQLITE_OMIT_AUTHORIZATION if( pAuthArg ){ - char *zAuthArg = pAuthArg->zToken; + char *zAuthArg = pAuthArg->u.zToken; if( zAuthArg==0 ){ goto attach_end; } |