Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcfd1843

Browse files
author
Michael Meskes
committed
- Synced preproc.y with gram.y.
 - Synced pgc.l with scan.l. - Synced keyword.c. - Set ecpg version to 2.9.0. - Set library version to 3.3.0.
1 parent0b370ea commitcfd1843

File tree

3 files changed

+34
-8
lines changed

3 files changed

+34
-8
lines changed

‎src/interfaces/ecpg/ChangeLog‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,3 +1073,11 @@ Thu Apr 5 10:11:35 CEST 2001
10731073
- Fixed long long problem.
10741074
- Set ecpg version to 2.8.0.
10751075
- Set library version to 3.2.0.
1076+
1077+
Fri Jun 1 08:13:25 CEST 2001
1078+
1079+
- Synced preproc.y with gram.y.
1080+
- Synced pgc.l with scan.l.
1081+
- Synced keyword.c.
1082+
- Set ecpg version to 2.9.0.
1083+
- Set library version to 3.3.0.

‎src/interfaces/ecpg/preproc/keywords.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.40 2001/05/07 00:43:26 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.41 2001/06/01 06:23:19 meskes Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -44,6 +44,7 @@ static ScanKeyword ScanKeywords[] = {
4444
{"as",AS},
4545
{"asc",ASC},
4646
{"at",AT},
47+
{"authorization",AUTHORIZATION},
4748
{"backward",BACKWARD},
4849
{"before",BEFORE},
4950
{"begin",BEGIN_TRANS},

‎src/interfaces/ecpg/preproc/preproc.y‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ make_name(void)
172172
%tokenTYPECAST
173173

174174
/* Keywords (in SQL92 reserved words)*/
175-
%tokenABSOLUTE,ACTION,ADD,ALL,ALTER,AND,ANY,AS,ASC,
175+
%tokenABSOLUTE,ACTION,ADD,ALL,ALTER,AND,ANY,AS,ASC,AT,AUTHORIZATION,
176176
BEGIN_TRANS,BETWEEN,BOTH,BY,
177177
CASCADE,CASE,CAST,CHAIN,CHAR,CHARACTER,
178178
CHARACTERISTICS,CHECK,CLOSE,
@@ -293,7 +293,7 @@ make_name(void)
293293
%type<str>row_exprrow_descriptorrow_listConstDatetimeopt_chain
294294
%type<str>SelectStmtinto_clauseOptTempConstraintAttributeSpec
295295
%type<str>opt_tableopt_allsort_clausesortby_listConstraintAttr
296-
%type<str>sortbyOptUseOprelation_name_listname_list
296+
%type<str>sortbyOptUseOprelation_name_listname_listColId_or_Sconst
297297
%type<str>group_clausehaving_clausefrom_clauseopt_distinct
298298
%type<str>join_outerwhere_clauserelation_exprsub_typeopt_arg
299299
%type<str>opt_column_listinsert_restInsertStmtOptimizableStmt
@@ -802,6 +802,10 @@ VariableSetStmt: SET ColId TO var_value
802802
{
803803
$$ = cat2_str(make_str("set names"),$3);
804804
}
805+
|SETSESSIONAUTHORIZATIONColId_or_Sconst
806+
{
807+
$$ = cat2_str(make_str("set session authorization"),$4);
808+
}
805809
;
806810

807811
opt_level:READCOMMITTED {$$ = make_str("read committed"); }
@@ -836,6 +840,10 @@ opt_encoding:StringConst { $$ = $1; }
836840
|/*EMPTY*/ {$$ = EMPTY; }
837841
;
838842

843+
ColId_or_Sconst:ColId{$$ =$1; }
844+
|SCONST{$$ =$1; }
845+
;
846+
839847
VariableShowStmt:SHOWColId
840848
{
841849
$$ = cat2_str(make_str("show"),$2);
@@ -1677,9 +1685,9 @@ comment_text: StringConst{ $$ = $1; }
16771685
*
16781686
*****************************************************************************/
16791687

1680-
GrantStmt:GRANTprivilegesONrelation_name_listTOgranteeopt_with_grant
1688+
GrantStmt:GRANTprivilegesONopt_tablerelation_name_listTOgranteeopt_with_grant
16811689
{
1682-
$$ = cat_str(7, make_str("grant"),$2, make_str("on"),$4, make_str("to"),$6);
1690+
$$ = cat_str(8, make_str("grant"),$2, make_str("on"),$4,$5,make_str("to"),$7);
16831691
}
16841692
;
16851693

@@ -1727,6 +1735,14 @@ operation: SELECT
17271735
{
17281736
$$ = make_str("rule");
17291737
}
1738+
|REFERENCES
1739+
{
1740+
$$ = make_str("references");
1741+
}
1742+
|TRIGGER
1743+
{
1744+
$$ = make_str("trigger");
1745+
}
17301746
;
17311747

17321748
grantee:PUBLIC
@@ -1758,9 +1774,9 @@ opt_with_grant: WITH GRANT OPTION
17581774
*
17591775
*****************************************************************************/
17601776

1761-
RevokeStmt:REVOKEprivilegesONrelation_name_listFROMgrantee
1777+
RevokeStmt:REVOKEprivilegesONopt_tablerelation_name_listFROMgrantee
17621778
{
1763-
$$ = cat_str(7, make_str("revoke"),$2, make_str("on"),$4, make_str("from"),$6);
1779+
$$ = cat_str(8, make_str("revoke"),$2, make_str("on"),$4,$5,make_str("from"),$7);
17641780
}
17651781
;
17661782

@@ -4939,6 +4955,7 @@ TokenId: ABSOLUTE{ $$ = make_str("absolute"); }
49394955
|AGGREGATE{$$ = make_str("aggregate"); }
49404956
|ALTER{$$ = make_str("alter"); }
49414957
|AT{$$ = make_str("at"); }
4958+
|AUTHORIZATION{$$ = make_str("authorization"); }
49424959
|BACKWARD{$$ = make_str("backward"); }
49434960
|BEFORE{$$ = make_str("before"); }
49444961
|BEGIN_TRANS{$$ = make_str("begin"); }
@@ -5027,7 +5044,7 @@ TokenId: ABSOLUTE{ $$ = make_str("absolute"); }
50275044
|SHARE{$$ = make_str("share"); }
50285045
|START{$$ = make_str("start"); }
50295046
|STATEMENT{$$ = make_str("statement"); }
5030-
|STATISTICS{$$ = make_str("statistics"); }
5047+
|STATISTICS{$$ = make_str("statistics"); }
50315048
|STDIN {$$ = make_str("stdin"); }
50325049
|STDOUT {$$ = make_str("stdout"); }
50335050
|SYSID {$$ = make_str("sysid"); }

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp