diff options
author | drh <drh@noemail.net> | 2002-03-30 15:26:50 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2002-03-30 15:26:50 +0000 |
commit | f18543ca39912c5be43a532c9c1c86515d0dc35b (patch) | |
tree | 6934264a434a896492397f6aceed8a76ed1a5ffb /src | |
parent | edaa6ebfdd742a1da48b2515e58e1abe11399a46 (diff) | |
download | sqlite-f18543ca39912c5be43a532c9c1c86515d0dc35b.tar.gz sqlite-f18543ca39912c5be43a532c9c1c86515d0dc35b.zip |
Fix for bug #3: Allow VIEW as a column name. Also allow COPY. (CVS 507)
FossilOrigin-Name: d2bdc0feeb3a3595850f40ab211df7a3963d6c30
Diffstat (limited to 'src')
-rw-r--r-- | src/parse.y | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/parse.y b/src/parse.y index 2343d0410..2ef406fde 100644 --- a/src/parse.y +++ b/src/parse.y @@ -14,7 +14,7 @@ ** the parser. Lemon will also generate a header file containing ** numeric codes for all of the tokens. ** -** @(#) $Id: parse.y,v 1.58 2002/03/24 13:13:29 drh Exp $ +** @(#) $Id: parse.y,v 1.59 2002/03/30 15:26:51 drh Exp $ */ %token_prefix TK_ %token_type {Token} @@ -97,24 +97,26 @@ columnid ::= ids(X). {sqliteAddColumn(pParse,&X);} // an abbreviation of "description"). // %type id {Token} -id(A) ::= DESC(X). {A = X;} +id(A) ::= ABORT(X). {A = X;} id(A) ::= ASC(X). {A = X;} -id(A) ::= DELIMITERS(X). {A = X;} -id(A) ::= EXPLAIN(X). {A = X;} -id(A) ::= VACUUM(X). {A = X;} id(A) ::= BEGIN(X). {A = X;} -id(A) ::= END(X). {A = X;} -id(A) ::= PRAGMA(X). {A = X;} id(A) ::= CLUSTER(X). {A = X;} +id(A) ::= CONFLICT(X). {A = X;} +id(A) ::= COPY(X). {A = X;} +id(A) ::= DELIMITERS(X). {A = X;} +id(A) ::= DESC(X). {A = X;} +id(A) ::= END(X). {A = X;} +id(A) ::= EXPLAIN(X). {A = X;} +id(A) ::= FAIL(X). {A = X;} id(A) ::= ID(X). {A = X;} -id(A) ::= TEMP(X). {A = X;} -id(A) ::= OFFSET(X). {A = X;} -id(A) ::= KEY(X). {A = X;} -id(A) ::= ABORT(X). {A = X;} id(A) ::= IGNORE(X). {A = X;} +id(A) ::= KEY(X). {A = X;} +id(A) ::= OFFSET(X). {A = X;} +id(A) ::= PRAGMA(X). {A = X;} id(A) ::= REPLACE(X). {A = X;} -id(A) ::= FAIL(X). {A = X;} -id(A) ::= CONFLICT(X). {A = X;} +id(A) ::= TEMP(X). {A = X;} +id(A) ::= VACUUM(X). {A = X;} +id(A) ::= VIEW(X). {A = X;} // And "ids" is an identifer-or-string. // |