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