Fix the keyword generator so that it works with SQLITE_OMIT_ALTERTABLE. (CVS 2096)

FossilOrigin-Name: 60ace9985d4ea2ef0fd245027fab2fffc32014b6

diff --git a/manifest b/manifest
index 830a1409bf24ab14ecbe8c53a79700f8dfce0b51..d771c9679f2bda7218717954487c3c44848f7a77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Autoincrement\sis\snow\sworking\sand\shas\sregression\stests.\s(CVS\s2095)
-D 2004-11-13T03:48:07
+C Fix\sthe\skeyword\sgenerator\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_ALTERTABLE.\s(CVS\s2096)
+D 2004-11-13T03:59:25
 F Makefile.in c4d2416860f472a1e3393714d0372074197565df
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -205,7 +205,7 @@ F tool/lempar.c 1e61d2b6cb9d8affa264a13336bc0c088498caa4
 F tool/memleak.awk b744b6109566206c746d826f6ecdba34662216bc
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 336eb50b0849dbf99b1d5462d9c37291b01b2b43
-F tool/mkkeywordhash.c 27753dd082cb1a7132866a7b73b91a55c6c8f2d4
+F tool/mkkeywordhash.c 5f0d8bd4928e84e736469f9c989dae239314138e
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816
@@ -257,7 +257,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 5e058318441bb5043c609cc8fba1653995e90efb
-R c2b0cdd20fba53e39338d096ea4e7b99
+P 10c712a21961dbc3bff89c49d5ec3b84b9187c80
+R 6f76dd8333301216fe464e4f92eb6cb4
 U drh
-Z af7f52e053f24291ed6aecd06da0eb9b
+Z da59a89dc62ed0410dba6254f89f1869

diff --git a/manifest.uuid b/manifest.uuid
index 7ba4acf28bb9a261e765fd45c2fe0584f57360e2..720007fefe00e5702a900d3f4f76467cc48a7e43 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-10c712a21961dbc3bff89c49d5ec3b84b9187c80
\ No newline at end of file
+60ace9985d4ea2ef0fd245027fab2fffc32014b6
\ No newline at end of file

diff --git a/tool/mkkeywordhash.c b/tool/mkkeywordhash.c
index 003a051bbc9cb4b663d6fd52cd6deb19c1f76896..57e0201b928f83a6d6cb38d7d6e2ad7ad185f4e9 100644 (file)
--- a/tool/mkkeywordhash.c
+++ b/tool/mkkeywordhash.c
@@ -29,7 +29,7 @@ struct Keyword {
 /*
 ** Define masks used to determine which keywords are allowed
 */
-#ifdef SQLITE_OMIT_ALTER_TABLE
+#ifdef SQLITE_OMIT_ALTERTABLE
 #  define ALTER      0
 #else
 #  define ALTER      1
@@ -190,7 +190,7 @@ static Keyword aKeywordTable[] = {
   { "TEMP",             "TK_TEMP",         ALWAYS                 },
   { "TEMPORARY",        "TK_TEMP",         ALWAYS                 },
   { "THEN",             "TK_THEN",         ALWAYS                 },
-  { "TO",               "TK_TO",           ALWAYS                 },
+  { "TO",               "TK_TO",           ALTER                  },
   { "TRANSACTION",      "TK_TRANSACTION",  ALWAYS                 },
   { "TRIGGER",          "TK_TRIGGER",      TRIGGER                },
   { "UNION",            "TK_UNION",        COMPOUND               },