From ebe0b236909732c75d665c73363bd4ac7a7aa138 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Wed, 8 Nov 2000 21:28:06 +0000 Subject: [PATCH] Add ANALYSE spelling of ANALYZE for vacuum. --- src/backend/parser/gram.y | 6 ++++-- src/backend/parser/keywords.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 0de10c74ba..4fbc628c58 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.206 2000/11/06 15:47:17 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.207 2000/11/08 21:28:06 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -334,7 +334,7 @@ static void doNegateFloat(Value *v); * when some sort of pg_privileges relation is introduced. * - Todd A. Brandys 1998-01-01? */ -%token ABORT_TRANS, ACCESS, AFTER, AGGREGATE, ANALYZE, +%token ABORT_TRANS, ACCESS, AFTER, AGGREGATE, ANALYZE, ANALYSE /* British */ BACKWARD, BEFORE, BINARY, BIT, CACHE, CHECKPOINT, CLUSTER, COMMENT, COPY, CREATEDB, CREATEUSER, CYCLE, DATABASE, DELIMITERS, DO, @@ -3058,6 +3058,7 @@ opt_verbose: VERBOSE { $$ = TRUE; } ; opt_analyze: ANALYZE { $$ = TRUE; } + | ANALYSE /* British */ { $$ = TRUE; } | /*EMPTY*/ { $$ = FALSE; } ; @@ -5535,6 +5536,7 @@ TokenId: ABSOLUTE { $$ = "absolute"; } ColLabel: ColId { $$ = $1; } | ABORT_TRANS { $$ = "abort"; } | ALL { $$ = "all"; } + | ANALYSE { $$ = "analyse"; } /* British */ | ANALYZE { $$ = "analyze"; } | ANY { $$ = "any"; } | ASC { $$ = "asc"; } diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index b03fc5e55c..f3e4d85e4c 100644 --- a/src/backend/parser/keywords.c +++ b/src/backend/parser/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.83 2000/11/06 15:47:17 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.84 2000/11/08 21:28:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,6 +38,7 @@ static ScanKeyword ScanKeywords[] = { {"aggregate", AGGREGATE}, {"all", ALL}, {"alter", ALTER}, + {"analyse", ANALYSE}, /* British spelling */ {"analyze", ANALYZE}, {"and", AND}, {"any", ANY},