Somehow I missed some parser changes, so this commit comes pretty late. I just...

Somehow I missed some parser changes, so this commit comes pretty late. I just synced the parser of ecpg against the backend version, but still have to sync the lexer.

Also I fixed a bug in a bug fix I committed a few weeks ago. he check for a varchar pointer was incomplete.

src/interfaces/ecpg/ChangeLog

@@ -1940,6 +1940,11 @@ Mon Sep 12 13:53:35 CEST 2005
 
 	- Fixed transaction command handling to not ignore savepoints
 	  and to correctly check for errors.
+
+Tue Oct  4 15:23:00 CEST 2005
+
+	- Synced parser.
+	- Fixed another bug in check to report missing varchar pointer implementation.
 	- Set ecpg library version to 5.1.
 	- Set ecpg version to 4.1.1.
 

src/interfaces/ecpg/preproc/keywords.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.68 2004/12/31 22:03:48 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.69 2005/10/04 13:28:21 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,6 +33,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"access", ACCESS},
 	{"action", ACTION},
 	{"add", ADD},
+	{"admin", ADMIN},
 	{"after", AFTER},
 	{"aggregate", AGGREGATE},
 	{"all", ALL},
@@ -47,6 +48,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"asc", ASC},
 		{"assertion", ASSERTION},
 		{"assignment", ASSIGNMENT},
+		{"asymmetric", ASYMMETRIC},
 		{"at", AT},
 		{"authorization", AUTHORIZATION},
 		{"backward", BACKWARD},
@@ -79,6 +81,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"comment", COMMENT},
 		{"commit", COMMIT},
 		{"committed", COMMITTED},
+		{"connection", CONNECTION},
 		{"constraint", CONSTRAINT},
 		{"constraints", CONSTRAINTS},
 		{"conversion", CONVERSION_P},
@@ -86,13 +89,14 @@ static ScanKeyword ScanKeywords[] = {
 		{"copy", COPY},
 		{"create", CREATE},
 		{"createdb", CREATEDB},
+		{"createrole", CREATEROLE},
 		{"createuser", CREATEUSER},
 		{"cross", CROSS},
 		{"csv", CSV},
 		{"current_date", CURRENT_DATE},
+		{"current_role", CURRENT_ROLE},
 		{"current_time", CURRENT_TIME},
 		{"current_timestamp", CURRENT_TIMESTAMP},
-		{"current_user", CURRENT_USER},
 		{"cursor", CURSOR},
 		{"cycle", CYCLE},
 		{"database", DATABASE},
@@ -110,6 +114,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"delimiter", DELIMITER},
 		{"delimiters", DELIMITERS},
 		{"desc", DESC},
+		{"disable", DISABLE_P},
 		{"distinct", DISTINCT},
 		{"do", DO},
 		{"domain", DOMAIN_P},
@@ -117,6 +122,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"drop", DROP},
 		{"each", EACH},
 		{"else", ELSE},
+		{"enable", ENABLE_P},
 		{"encoding", ENCODING},
 		{"encrypted", ENCRYPTED},
 		{"end", END_P},
@@ -144,9 +150,12 @@ static ScanKeyword ScanKeywords[] = {
 		{"get", GET},
 		{"global", GLOBAL},
 		{"grant", GRANT},
+		{"granted", GRANTED},
+		{"greatest", GREATEST},
 		{"group", GROUP_P},
 		{"handler", HANDLER},
 		{"having", HAVING},
+		{"header", HEADER},
 		{"hold", HOLD},
 		{"hour", HOUR_P},
 		{"ilike", ILIKE},
@@ -157,6 +166,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"including", INCLUDING},
 		{"increment", INCREMENT},
 		{"index", INDEX},
+		{"inherit", INHERIT},
 		{"inherits", INHERITS},
 		{"initially", INITIALLY},
 		{"inner", INNER_P},
@@ -181,6 +191,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"large", LARGE_P},
 		{"last", LAST_P},
 		{"leading", LEADING},
+		{"least", LEAST},
 		{"left", LEFT},
 		{"level", LEVEL},
 		{"like", LIKE},
@@ -190,6 +201,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"local", LOCAL},
 		{"location", LOCATION},
 		{"lock", LOCK_P},
+		{"login", LOGIN_P},
 		{"match", MATCH},
 		{"maxvalue", MAXVALUE},
 		{"minute", MINUTE_P},
@@ -205,8 +217,12 @@ static ScanKeyword ScanKeywords[] = {
 		{"next", NEXT},
 		{"no", NO},
 		{"nocreatedb", NOCREATEDB},
+		{"nocreaterole", NOCREATEROLE},
 		{"nocreateuser", NOCREATEUSER},
+		{"noinherit", NOINHERIT},
+		{"nologin", NOLOGIN_P},
 		{"none", NONE},
+		{"nosuperuser", NOSUPERUSER},
 		{"not", NOT},
 		{"nothing", NOTHING},
 		{"notify", NOTIFY},
@@ -236,6 +252,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"position", POSITION},
 		{"precision", PRECISION},
 		{"prepare", PREPARE},
+		{"prepared", PREPARED},
 		{"preserve", PRESERVE},
 		{"primary", PRIMARY},
 		{"prior", PRIOR},
@@ -259,6 +276,7 @@ static ScanKeyword ScanKeywords[] = {
 		{"returns", RETURNS},
 		{"revoke", REVOKE},
 		{"right", RIGHT},
+		{"role", ROLE},
 		{"rollback", ROLLBACK},
 		{"row", ROW},
 		{"rows", ROWS},
@@ -290,7 +308,10 @@ static ScanKeyword ScanKeywords[] = {
 		{"storage", STORAGE},
 		{"strict", STRICT_P},
 		{"substring", SUBSTRING},
+		{"superuser", SUPERUSER_P},
+		{"symmetric", SYMMETRIC},
 		{"sysid", SYSID},
+		{"system", SYSTEM_P},
 		{"table", TABLE},
 		{"tablespace", TABLESPACE},
 		{"temp", TEMP},
@@ -318,11 +339,11 @@ static ScanKeyword ScanKeywords[] = {
 		{"unlisten", UNLISTEN},
 		{"until", UNTIL},
 		{"update", UPDATE},
-		{"usage", USAGE},
 		{"user", USER},
 		{"using", USING},
 		{"vacuum", VACUUM},
 		{"valid", VALID},
+		{"validator", VALIDATOR},
 		{"values", VALUES},
 		{"varchar", VARCHAR},
 		{"varying", VARYING},