From 6da861be0ecde622bb713a4be01f66af24f0380c Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 6 Apr 2009 14:16:43 +0000 Subject: [PATCH] Allow "default" to be a keyword used by PRAGMA statements. (CVS 6454) FossilOrigin-Name: ed99d2d97f11784dda0f61f8e7d0eb5ca1bca371 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/parse.y | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index a66cf4d508..d61905947b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\ssure\sthe\sreverse_unordered_selects\spragma\sworks\seven\son\sunindexed\ntables\sthat\sare\squeried\swithout\sa\sWHERE\sclause\s(CVS\s6453) -D 2009-04-06T12:26:58 +C Allow\s"default"\sto\sbe\sa\skeyword\sused\sby\sPRAGMA\sstatements.\s(CVS\s6454) +D 2009-04-06T14:16:43 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -145,7 +145,7 @@ F src/os_unix.c 5d667f24615043c937a138faaed5f3e93b8619b0 F src/os_win.c 524fe4c31c469531191857e8036ef59bfb52d684 F src/pager.c 1df277b7c78f780df119c9e2ddea6690979489c5 F src/pager.h 0c9f3520c00d8a3b8e792ca56c9a11b6b02b4b0f -F src/parse.y 070215cf461ab917c23253a9cbf0903f2b0d8f19 +F src/parse.y b7e4341b21736a90b952aa6bb663ec98529b778e F src/pcache.c 395f752a13574120bd7513a400ba02a265aaa76d F src/pcache.h 9b927ccc5a538e31b4c3bc7eec4f976db42a1324 F src/pcache1.c f587565f4ba0fd1772067eaa96814dce761b7a4c @@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 8ca612c42e0de3ef5b2f92d80a56db1bef34b1c6 -R dfbacba56708d373c01317fe8f0ba945 +P d8c6b28a734fccbbbd567d98ffa7e6557280f737 +R f0ce57456aa8766d0b9754cda1292c32 U drh -Z 5f95be47b5303e9e43b1ac41b9b703eb +Z 60fbf9a0bf63c5f97922a6d6d1f7b8d9 diff --git a/manifest.uuid b/manifest.uuid index 2a2fa17a53..eba79d5f70 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d8c6b28a734fccbbbd567d98ffa7e6557280f737 \ No newline at end of file +ed99d2d97f11784dda0f61f8e7d0eb5ca1bca371 \ No newline at end of file diff --git a/src/parse.y b/src/parse.y index cfbbd5085f..7024814370 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.273 2009/04/03 01:43:57 drh Exp $ +** @(#) $Id: parse.y,v 1.274 2009/04/06 14:16:43 drh Exp $ */ // All token codes are small integers with #defines that begin with "TK_" @@ -1018,6 +1018,7 @@ nmnum(A) ::= plus_num(X). {A = X;} nmnum(A) ::= nm(X). {A = X;} nmnum(A) ::= ON(X). {A = X;} nmnum(A) ::= DELETE(X). {A = X;} +nmnum(A) ::= DEFAULT(X). {A = X;} %endif SQLITE_OMIT_PRAGMA %endif SQLITE_OMIT_PARSER plus_num(A) ::= plus_opt number(X). {A = X;} -- 2.47.2