Skip to content

Commit ffa156b

Browse files
author
Michael Meskes
committed
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.
1 parent 9c76af4 commit ffa156b

File tree

3 files changed

+429
-244
lines changed

3 files changed

+429
-244
lines changed

src/interfaces/ecpg/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,6 +1940,11 @@ Mon Sep 12 13:53:35 CEST 2005
19401940

19411941
- Fixed transaction command handling to not ignore savepoints
19421942
and to correctly check for errors.
1943+
1944+
Tue Oct 4 15:23:00 CEST 2005
1945+
1946+
- Synced parser.
1947+
- Fixed another bug in check to report missing varchar pointer implementation.
19431948
- Set ecpg library version to 5.1.
19441949
- Set ecpg version to 4.1.1.
19451950

src/interfaces/ecpg/preproc/keywords.c

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.68 2004/12/31 22:03:48 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.69 2005/10/04 13:28:21 meskes Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -33,6 +33,7 @@ static ScanKeyword ScanKeywords[] = {
3333
{"access", ACCESS},
3434
{"action", ACTION},
3535
{"add", ADD},
36+
{"admin", ADMIN},
3637
{"after", AFTER},
3738
{"aggregate", AGGREGATE},
3839
{"all", ALL},
@@ -47,6 +48,7 @@ static ScanKeyword ScanKeywords[] = {
4748
{"asc", ASC},
4849
{"assertion", ASSERTION},
4950
{"assignment", ASSIGNMENT},
51+
{"asymmetric", ASYMMETRIC},
5052
{"at", AT},
5153
{"authorization", AUTHORIZATION},
5254
{"backward", BACKWARD},
@@ -79,20 +81,22 @@ static ScanKeyword ScanKeywords[] = {
7981
{"comment", COMMENT},
8082
{"commit", COMMIT},
8183
{"committed", COMMITTED},
84+
{"connection", CONNECTION},
8285
{"constraint", CONSTRAINT},
8386
{"constraints", CONSTRAINTS},
8487
{"conversion", CONVERSION_P},
8588
{"convert", CONVERT},
8689
{"copy", COPY},
8790
{"create", CREATE},
8891
{"createdb", CREATEDB},
92+
{"createrole", CREATEROLE},
8993
{"createuser", CREATEUSER},
9094
{"cross", CROSS},
9195
{"csv", CSV},
9296
{"current_date", CURRENT_DATE},
97+
{"current_role", CURRENT_ROLE},
9398
{"current_time", CURRENT_TIME},
9499
{"current_timestamp", CURRENT_TIMESTAMP},
95-
{"current_user", CURRENT_USER},
96100
{"cursor", CURSOR},
97101
{"cycle", CYCLE},
98102
{"database", DATABASE},
@@ -110,13 +114,15 @@ static ScanKeyword ScanKeywords[] = {
110114
{"delimiter", DELIMITER},
111115
{"delimiters", DELIMITERS},
112116
{"desc", DESC},
117+
{"disable", DISABLE_P},
113118
{"distinct", DISTINCT},
114119
{"do", DO},
115120
{"domain", DOMAIN_P},
116121
{"double", DOUBLE_P},
117122
{"drop", DROP},
118123
{"each", EACH},
119124
{"else", ELSE},
125+
{"enable", ENABLE_P},
120126
{"encoding", ENCODING},
121127
{"encrypted", ENCRYPTED},
122128
{"end", END_P},
@@ -144,9 +150,12 @@ static ScanKeyword ScanKeywords[] = {
144150
{"get", GET},
145151
{"global", GLOBAL},
146152
{"grant", GRANT},
153+
{"granted", GRANTED},
154+
{"greatest", GREATEST},
147155
{"group", GROUP_P},
148156
{"handler", HANDLER},
149157
{"having", HAVING},
158+
{"header", HEADER},
150159
{"hold", HOLD},
151160
{"hour", HOUR_P},
152161
{"ilike", ILIKE},
@@ -157,6 +166,7 @@ static ScanKeyword ScanKeywords[] = {
157166
{"including", INCLUDING},
158167
{"increment", INCREMENT},
159168
{"index", INDEX},
169+
{"inherit", INHERIT},
160170
{"inherits", INHERITS},
161171
{"initially", INITIALLY},
162172
{"inner", INNER_P},
@@ -181,6 +191,7 @@ static ScanKeyword ScanKeywords[] = {
181191
{"large", LARGE_P},
182192
{"last", LAST_P},
183193
{"leading", LEADING},
194+
{"least", LEAST},
184195
{"left", LEFT},
185196
{"level", LEVEL},
186197
{"like", LIKE},
@@ -190,6 +201,7 @@ static ScanKeyword ScanKeywords[] = {
190201
{"local", LOCAL},
191202
{"location", LOCATION},
192203
{"lock", LOCK_P},
204+
{"login", LOGIN_P},
193205
{"match", MATCH},
194206
{"maxvalue", MAXVALUE},
195207
{"minute", MINUTE_P},
@@ -205,8 +217,12 @@ static ScanKeyword ScanKeywords[] = {
205217
{"next", NEXT},
206218
{"no", NO},
207219
{"nocreatedb", NOCREATEDB},
220+
{"nocreaterole", NOCREATEROLE},
208221
{"nocreateuser", NOCREATEUSER},
222+
{"noinherit", NOINHERIT},
223+
{"nologin", NOLOGIN_P},
209224
{"none", NONE},
225+
{"nosuperuser", NOSUPERUSER},
210226
{"not", NOT},
211227
{"nothing", NOTHING},
212228
{"notify", NOTIFY},
@@ -236,6 +252,7 @@ static ScanKeyword ScanKeywords[] = {
236252
{"position", POSITION},
237253
{"precision", PRECISION},
238254
{"prepare", PREPARE},
255+
{"prepared", PREPARED},
239256
{"preserve", PRESERVE},
240257
{"primary", PRIMARY},
241258
{"prior", PRIOR},
@@ -259,6 +276,7 @@ static ScanKeyword ScanKeywords[] = {
259276
{"returns", RETURNS},
260277
{"revoke", REVOKE},
261278
{"right", RIGHT},
279+
{"role", ROLE},
262280
{"rollback", ROLLBACK},
263281
{"row", ROW},
264282
{"rows", ROWS},
@@ -290,7 +308,10 @@ static ScanKeyword ScanKeywords[] = {
290308
{"storage", STORAGE},
291309
{"strict", STRICT_P},
292310
{"substring", SUBSTRING},
311+
{"superuser", SUPERUSER_P},
312+
{"symmetric", SYMMETRIC},
293313
{"sysid", SYSID},
314+
{"system", SYSTEM_P},
294315
{"table", TABLE},
295316
{"tablespace", TABLESPACE},
296317
{"temp", TEMP},
@@ -318,11 +339,11 @@ static ScanKeyword ScanKeywords[] = {
318339
{"unlisten", UNLISTEN},
319340
{"until", UNTIL},
320341
{"update", UPDATE},
321-
{"usage", USAGE},
322342
{"user", USER},
323343
{"using", USING},
324344
{"vacuum", VACUUM},
325345
{"valid", VALID},
346+
{"validator", VALIDATOR},
326347
{"values", VALUES},
327348
{"varchar", VARCHAR},
328349
{"varying", VARYING},

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy