From ea82ad6aff59a62b0f9261561a72fb7090274093 Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Wed, 10 Oct 2007 06:33:17 +0000
Subject: [PATCH] Synced parser and keyword list.
---
src/interfaces/ecpg/ChangeLog | 4 ++++
src/interfaces/ecpg/preproc/keywords.c | 3 +--
src/interfaces/ecpg/preproc/preproc.y | 9 ++-------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 3be4f39e14d..500dbb4931a 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -2260,6 +2260,10 @@ Wed, 03 Oct 2007 10:48:39 +0200
exported.
- Created export list for ecpglib.
- Also created export list for pgytpeslib and compatlib.
+
+Wed, 10 Oct 2007 08:31:44 +0200
+
+ - Synced parser and keyword list.
- Set pgtypes library version to 3.0.
- Set compat library version to 3.0.
- Set ecpg library version to 6.0.
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 4145c577386..62dffb74af7 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.82 2007/09/04 10:02:29 meskes Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.83 2007/10/10 06:33:17 meskes Exp $
*
*-------------------------------------------------------------------------
*/
@@ -92,7 +92,6 @@ static const ScanKeyword ScanPGSQLKeywords[] = {
{"constraints", CONSTRAINTS},
{"content", CONTENT_P},
{"conversion", CONVERSION_P},
- {"convert", CONVERT},
{"copy", COPY},
{"cost", COST},
{"create", CREATE},
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 1c7cf0c72a9..985b40d1797 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.353 2007/10/03 11:11:12 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.354 2007/10/10 06:33:17 meskes Exp $ */
/* Copyright comment */
%{
@@ -422,7 +422,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
CHARACTER CHARACTERISTICS CHECK CHECKPOINT CLASS CLOSE
CLUSTER COALESCE COLLATE COLUMN COMMENT COMMIT
COMMITTED CONCURRENTLY CONFIGURATION CONNECTION CONSTRAINT CONSTRAINTS
- CONTENT_P CONVERSION_P CONVERT COPY COST CREATE CREATEDB
+ CONTENT_P CONVERSION_P COPY COST CREATE CREATEDB
CREATEROLE CREATEUSER CROSS CSV CURRENT_P CURRENT_DATE CURRENT_ROLE
CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR CYCLE
@@ -4405,10 +4405,6 @@ func_expr: func_name '(' ')'
{ $$ = cat_str(3, make_str("trim(trailing"), $4, make_str(")")); }
| TRIM '(' trim_list ')'
{ $$ = cat_str(3, make_str("trim("), $3, make_str(")")); }
- | CONVERT '(' a_expr USING any_name ')'
- { $$ = cat_str(5, make_str("convert("), $3, make_str("using"), $5, make_str(")"));}
- | CONVERT '(' expr_list ')'
- { $$ = cat_str(3, make_str("convert("), $3, make_str(")")); }
| NULLIF '(' a_expr ',' a_expr ')'
{ $$ = cat_str(5, make_str("nullif("), $3, make_str(","), $5, make_str(")")); }
| COALESCE '(' expr_list ')'
@@ -6652,7 +6648,6 @@ col_name_keyword:
*/
| CHARACTER { $$ = make_str("character"); }
| COALESCE { $$ = make_str("coalesce"); }
- | CONVERT { $$ = make_str("convert"); }
| DEC { $$ = make_str("dec"); }
| DECIMAL_P { $$ = make_str("decimal"); }
| EXISTS { $$ = make_str("exists"); }
--
GitLab