Add ANALYSE spelling of ANALYZE for vacuum.

bmomjian · bmomjian · commit ebe0b2369097 · 2000-11-08T21:28:06.000Z
diff --git 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
@@ -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},

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.206 2000/11/06 15:47:17 thomas Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.207 2000/11/08 21:28:06 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -334,7 +334,7 @@ static void doNegateFloat(Value *v);`
`334`	`334`	`* when some sort of pg_privileges relation is introduced.`
`335`	`335`	`* - Todd A. Brandys 1998-01-01?`
`336`	`336`	`*/`
`337`		`-%token ABORT_TRANS, ACCESS, AFTER, AGGREGATE, ANALYZE,`
	`337`	`+%token ABORT_TRANS, ACCESS, AFTER, AGGREGATE, ANALYZE, ANALYSE /* British */`
`338`	`338`	`BACKWARD, BEFORE, BINARY, BIT,`
`339`	`339`	`CACHE, CHECKPOINT, CLUSTER, COMMENT, COPY, CREATEDB, CREATEUSER, CYCLE,`
`340`	`340`	`DATABASE, DELIMITERS, DO,`
`@@ -3058,6 +3058,7 @@ opt_verbose: VERBOSE { $$ = TRUE; }`
`3058`	`3058`	`;`
`3059`	`3059`
`3060`	`3060`	`opt_analyze: ANALYZE { $$ = TRUE; }`
	`3061`	`+ \| ANALYSE /* British */ { $$ = TRUE; }`
`3061`	`3062`	`\| /EMPTY/ { $$ = FALSE; }`
`3062`	`3063`	`;`
`3063`	`3064`
`@@ -5535,6 +5536,7 @@ TokenId: ABSOLUTE { $$ = "absolute"; }`
`5535`	`5536`	`ColLabel: ColId { $$ = $1; }`
`5536`	`5537`	`\| ABORT_TRANS { $$ = "abort"; }`
`5537`	`5538`	`\| ALL { $$ = "all"; }`
	`5539`	`+ \| ANALYSE { $$ = "analyse"; } /* British */`
`5538`	`5540`	`\| ANALYZE { $$ = "analyze"; }`
`5539`	`5541`	`\| ANY { $$ = "any"; }`
`5540`	`5542`	`\| ASC { $$ = "asc"; }`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.83 2000/11/06 15:47:17 thomas Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.84 2000/11/08 21:28:06 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -38,6 +38,7 @@ static ScanKeyword ScanKeywords[] = {`
`38`	`38`	`{"aggregate", AGGREGATE},`
`39`	`39`	`{"all", ALL},`
`40`	`40`	`{"alter", ALTER},`
	`41`	`+ {"analyse", ANALYSE}, /* British spelling */`
`41`	`42`	`{"analyze", ANALYZE},`
`42`	`43`	`{"and", AND},`
`43`	`44`	`{"any", ANY},`