- Synced parser and keyword list

- Renamed update test so it hopefully runs on Vista

src/interfaces/ecpg/ChangeLog

@@ -2188,4 +2188,9 @@ Fr 27. Apr 08:55:25 CEST 2007
 
 	- Inlined two functions to get rid of va_list problems on some
 	  architectures.
+
+Th 10. Mai 09:42:42 CEST 2007
+
+	- Synced parser and keyword list
+	- Renamed update test so it hopefully runs on Vista
 	- Set ecpg version to 4.3.1.

src/interfaces/ecpg/preproc/c_keywords.c

@@ -3,7 +3,7 @@
  * keywords.c
  *	  lexical token lookup for reserved words in postgres embedded SQL
  *
- * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/c_keywords.c,v 1.19 2006/07/30 16:28:58 meskes Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/c_keywords.c,v 1.20 2007/05/10 09:53:16 meskes Exp $
  * §
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"bool", SQL_BOOL},
 	{"char", CHAR_P},
 	{"const", S_CONST},
-	{"enum", SQL_ENUM},
+	{"enum", ENUM_P},
 	{"extern", S_EXTERN},
 	{"float", FLOAT_P},
 	{"hour", HOUR_P},

src/interfaces/ecpg/preproc/ecpg_keywords.c

@@ -4,7 +4,7 @@
  *	  lexical token lookup for reserved words in postgres embedded SQL
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg_keywords.c,v 1.33 2007/03/17 19:25:23 meskes Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg_keywords.c,v 1.34 2007/05/10 09:53:16 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,7 +40,6 @@ static ScanKeyword ScanKeywords[] = {
 	{"describe", SQL_DESCRIBE},
 	{"descriptor", SQL_DESCRIPTOR},
 	{"disconnect", SQL_DISCONNECT},
-	{"enum", SQL_ENUM},
 	{"found", SQL_FOUND},
 	{"free", SQL_FREE},
 	{"go", SQL_GO},

src/interfaces/ecpg/preproc/keywords.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.78 2007/03/17 19:25:23 meskes Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.79 2007/05/10 09:53:16 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,6 +39,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"all", ALL},
 	{"also", ALSO},
 	{"alter", ALTER},
+	{"always", ALWAYS},
 	{"analyse", ANALYSE},		/* British spelling */
 	{"analyze", ANALYZE},
 	{"and", AND},
@@ -120,6 +121,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"delimiters", DELIMITERS},
 	{"desc", DESC},
 	{"disable", DISABLE_P},
+	{"discard", DISCARD},
 	{"distinct", DISTINCT},
 	{"do", DO},
 	{"document", DOCUMENT_P},
@@ -132,6 +134,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"encoding", ENCODING},
 	{"encrypted", ENCRYPTED},
 	{"end", END_P},
+	{"enum", ENUM_P},
 	{"escape", ESCAPE},
 	{"except", EXCEPT},
 	{"excluding", EXCLUDING},
@@ -261,6 +264,8 @@ static ScanKeyword ScanKeywords[] = {
 	{"owner", OWNER},
 	{"partial", PARTIAL},
 	{"password", PASSWORD},
+	{"placing", PLACING},
+	{"plans", PLANS},
 	{"position", POSITION},
 	{"precision", PRECISION},
 	{"prepare", PREPARE},
@@ -283,6 +288,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"rename", RENAME},
 	{"repeatable", REPEATABLE},
 	{"replace", REPLACE},
+	{"replica", REPLICA},
 	{"reset", RESET},
 	{"restart", RESTART},
 	{"restrict", RESTRICT},

src/interfaces/ecpg/test/expected/sql-update.c → src/interfaces/ecpg/test/expected/sql-insupd.c

@@ -7,7 +7,7 @@
 /* End of automatic include section */
 #define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
 
-#line 1 "update.pgc"
+#line 1 "insupd.pgc"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -20,95 +20,95 @@
 
 
 
-#line 5 "update.pgc"
+#line 5 "insupd.pgc"
 
 
 int main(int argc, char* argv[]) {
   /* exec sql begin declare section */
   	  
   
-#line 9 "update.pgc"
+#line 9 "insupd.pgc"
  int  i1 [ 3 ]    ,  i2 [ 3 ]    ;
 /* exec sql end declare section */
-#line 10 "update.pgc"
+#line 10 "insupd.pgc"
 
 
   ECPGdebug(1, stderr);
   { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); }
-#line 13 "update.pgc"
+#line 13 "insupd.pgc"
 
 
   /* exec sql whenever sql_warning  sqlprint ; */
-#line 15 "update.pgc"
+#line 15 "insupd.pgc"
 
   /* exec sql whenever sqlerror  sqlprint ; */
-#line 16 "update.pgc"
+#line 16 "insupd.pgc"
 
 
   { ECPGdo(__LINE__, 0, 1, NULL, "create  table test ( a int   , b int   )    ", ECPGt_EOIT, ECPGt_EORT);
-#line 18 "update.pgc"
+#line 18 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 18 "update.pgc"
+#line 18 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 18 "update.pgc"
+#line 18 "insupd.pgc"
 
 
   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a  , b  ) values ( 1 , 1 ) ", ECPGt_EOIT, ECPGt_EORT);
-#line 20 "update.pgc"
+#line 20 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 20 "update.pgc"
+#line 20 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 20 "update.pgc"
+#line 20 "insupd.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a  , b  ) values ( 2 , 2 ) ", ECPGt_EOIT, ECPGt_EORT);
-#line 21 "update.pgc"
+#line 21 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 21 "update.pgc"
+#line 21 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 21 "update.pgc"
+#line 21 "insupd.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a  , b  ) values ( 3 , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
-#line 22 "update.pgc"
+#line 22 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 22 "update.pgc"
+#line 22 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 22 "update.pgc"
+#line 22 "insupd.pgc"
 
 
   { ECPGdo(__LINE__, 0, 1, NULL, "update test set a  = a + 1   ", ECPGt_EOIT, ECPGt_EORT);
-#line 24 "update.pgc"
+#line 24 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 24 "update.pgc"
+#line 24 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 24 "update.pgc"
+#line 24 "insupd.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, "update test set ( a  , b  )= ( 5 , 5 )  where a = 4 ", ECPGt_EOIT, ECPGt_EORT);
-#line 25 "update.pgc"
+#line 25 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 25 "update.pgc"
+#line 25 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 25 "update.pgc"
+#line 25 "insupd.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, "update test set a  = 4  where a = 3 ", ECPGt_EOIT, ECPGt_EORT);
-#line 26 "update.pgc"
+#line 26 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 26 "update.pgc"
+#line 26 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 26 "update.pgc"
+#line 26 "insupd.pgc"
 ;
 
   { ECPGdo(__LINE__, 0, 1, NULL, "select  a , b  from test    order by a  ", ECPGt_EOIT, 
@@ -116,25 +116,25 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_int,(i2),(long)1,(long)3,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 28 "update.pgc"
+#line 28 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 28 "update.pgc"
+#line 28 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 28 "update.pgc"
+#line 28 "insupd.pgc"
 
 
   printf("test\na b\n%d %d\n%d %d\n%d %d\n", i1[0], i2[0], i1[1], i2[1], i1[2], i2[2]);
 
   { ECPGdisconnect(__LINE__, "ALL");
-#line 32 "update.pgc"
+#line 32 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
-#line 32 "update.pgc"
+#line 32 "insupd.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 32 "update.pgc"
+#line 32 "insupd.pgc"
 
 
   return 0;

src/interfaces/ecpg/test/sql/Makefile

@@ -19,7 +19,7 @@ TESTS = array array.c \
         parser parser.c \
         quote quote.c \
         show show.c \
-        update update.c 
+        insupd insupd.c 
 
 all: $(TESTS)