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

Commit13c843d

Browse files
author
Michael Meskes
committed
Synced parser
1 parent46dd4db commit13c843d

File tree

2 files changed

+44
-41
lines changed

2 files changed

+44
-41
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2362,6 +2362,10 @@ Tue, 20 May 2008 17:31:01 +0200
23622362
Wed, 04 Jun 2008 14:22:30 +0200
23632363

23642364
- Added lost symbol SQL to list of allowed variable names.
2365+
2366+
Tue, 24 Jun 2008 13:30:51 +0200
2367+
2368+
- Synced parser.
23652369
- Set pgtypes library version to 3.1.
23662370
- Set compat library version to 3.1.
23672371
- Set ecpg library version to 6.2.

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

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.367 2008/06/04 12:23:34 meskes Exp $*/
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.368 2008/06/26 08:04:05 meskes Exp $*/
22

33
/* Copyright comment*/
44
%{
@@ -556,15 +556,15 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
556556
%type<str>target_listtarget_elalias_clausetype_func_name_keyword
557557
%type<str>qualified_namedatabase_namealter_usingtype_function_name
558558
%type<str>access_methodattr_nameindex_namenamefunc_nameopt_restart_seqs
559-
%type<str>file_nameAexprConstc_exprConstTypenamevar_list
559+
%type<str>file_nameAexprConstc_exprConstTypenamevar_list
560560
%type<str>a_exprb_exprTruncateStmtCommentStmtOnCommitOptionopt_by
561-
%type<str>opt_indirectionexpr_listextract_listextract_arg
561+
%type<str>opt_indirectionexpr_listextract_listextract_argOptSeqOptList
562562
%type<str>position_listsubstr_listsubstr_fromalter_column_default
563563
%type<str>trim_listin_exprsubstr_forattrsTableFuncElement
564564
%type<str>TypenameSimpleTypenameNumericopt_floatDiscardStmt
565565
%type<str>Charactercharacteropt_varyingopt_charsetenum_val_list
566566
%type<str>opt_timezoneopt_intervaltable_reffetch_direction
567-
%type<str>ConstDatetimeAlterDomainStmtAlterSeqStmtalter_rel_cmds
567+
%type<str>ConstDatetimeAlterDomainStmtAlterSeqStmt
568568
%type<str>SelectStmtinto_clauseOptTempConstraintAttributeSpec
569569
%type<str>opt_tableopt_allsort_clausesortby_listConstraintAttr
570570
%type<str>sortbyqualified_name_listname_listColId_or_Sconst
@@ -591,8 +591,8 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
591591
%type<str>VariableSetStmtvar_valuezone_valueVariableShowStmt
592592
%type<str>VariableResetStmtAlterTableStmtfrom_listoverlay_list
593593
%type<str>relation_nameOptTableSpaceLockStmtopt_lock
594-
%type<str>CreateUserStmtAlterUserStmtCreateSeqStmtOptSeqList
595-
%type<str>OptSeqElemTriggerForSpecTriggerForOptTriggerForType
594+
%type<str>CreateUserStmtAlterUserStmtCreateSeqStmtSeqOptList
595+
%type<str>SeqOptElemTriggerForSpecTriggerForOptTriggerForType
596596
%type<str>DropTrigStmtTriggerOneEventTriggerEventsRuleActionStmt
597597
%type<str>TriggerActionTimeCreateTrigStmtDropPLangStmtDropCastStmt
598598
%type<str>CreatePLangStmtTriggerFuncArgsTriggerFuncArgsimple_select
@@ -621,7 +621,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
621621
%type<str>handler_nameany_name_listany_nameopt_asinsert_column_list
622622
%type<str>columnrefvalues_clauseAllConstVarprep_type_clauseExecuteStmt
623623
%type<str>insert_column_itemDropRuleStmtctext_exprexecute_param_clause
624-
%type<str>createfunc_opt_itemset_restalter_rel_cmd
624+
%type<str>createfunc_opt_itemset_rest
625625
%type<str>CreateFunctionStmtcreatefunc_opt_listfunc_table
626626
%type<str>DropUserStmtcopy_fromcopy_opt_listcopy_opt_item
627627
%type<str>opt_oidsTableLikeClausekey_actionopt_definition
@@ -1347,55 +1347,58 @@ DiscardStmt:
13471347

13481348
/*****************************************************************************
13491349
*
1350-
*ALTER [ TABLE | INDEX ] variations
1350+
*ALTER [ TABLE | INDEX| SEQUENCE | VIEW] variations
13511351
*
13521352
*****************************************************************************/
13531353

13541354
AlterTableStmt:
13551355
ALTERTABLErelation_expralter_table_cmds
13561356
{$$ = cat_str(3, make_str("alter table"),$3,$4); }
1357-
|ALTERINDEXrelation_expralter_rel_cmds
1358-
{$$ = cat_str(3, make_str("alter table"),$3,$4); }
1357+
|ALTERINDEXrelation_expralter_table_cmds
1358+
{$$ = cat_str(3, make_str("alter index"),$3,$4); }
1359+
|ALTERSEQUENCErelation_expralter_table_cmds
1360+
{$$ = cat_str(3, make_str("alter sequence"),$3,$4); }
1361+
|ALTERVIEWrelation_expralter_table_cmds
1362+
{$$ = cat_str(3, make_str("alter view"),$3,$4); }
13591363
;
13601364

1361-
/* Subcommands that are for ALTER TABLE only*/
13621365
alter_table_cmds:
13631366
alter_table_cmd {$$ =$1; }
13641367
|alter_table_cmds','alter_table_cmd{$$ = cat_str(3,$1, make_str(","),$3); }
13651368
;
13661369

13671370
alter_table_cmd:
1371+
/* ALTER TABLE <name> ADD [COLUMN] <coldef>*/
13681372
ADD_Popt_columncolumnDef
1369-
/* ALTER TABLE <relation> ADD [COLUMN] <coldef>*/
13701373
{$$ = cat_str(3, make_str("add"),$2,$3); }
1371-
/* ALTER TABLE <relation> ALTER [COLUMN] <colname> {SET DEFAULT <expr>|DROP DEFAULT}*/
1374+
/* ALTER TABLE <name> ALTER [COLUMN] <colname> {SET DEFAULT <expr>|DROP DEFAULT}*/
13721375
|ALTERopt_columnColIdalter_column_default
13731376
{$$ = cat_str(4, make_str("alter"),$2,$3,$4); }
1374-
/* ALTER TABLE <relation> ALTER [COLUMN] <colname> DROP NOT NULL*/
1377+
/* ALTER TABLE <name> ALTER [COLUMN] <colname> DROP NOT NULL*/
13751378
|ALTERopt_columnColIdDROPNOTNULL_P
13761379
{$$ = cat_str(4, make_str("alter"),$2,$3, make_str("drop not null")); }
1377-
/* ALTER TABLE <relation> ALTER [COLUMN] <colname> SET NOT NULL*/
1380+
/* ALTER TABLE <name> ALTER [COLUMN] <colname> SET NOT NULL*/
13781381
|ALTERopt_columnColIdSETNOTNULL_P
13791382
{$$ = cat_str(4, make_str("alter"),$2,$3, make_str("set not null")); }
1380-
/* ALTER TABLE <relation> ALTER [COLUMN] <colname> SET STATISTICS <IntegerOnly>*/
1383+
/* ALTER TABLE <name> ALTER [COLUMN] <colname> SET STATISTICS <IntegerOnly>*/
13811384
|ALTERopt_columnColIdSETSTATISTICSPosIntConst
13821385
{$$ = cat_str(5, make_str("alter"),$2,$3, make_str("set statistics"),$6); }
1383-
/* ALTER TABLE <relation> ALTER [COLUMN] <colname> SET STORAGE <storagemode>*/
1386+
/* ALTER TABLE <name> ALTER [COLUMN] <colname> SET STORAGE <storagemode>*/
13841387
|ALTERopt_columnColIdSETSTORAGEColId
13851388
{$$ = cat_str(5, make_str("alter"),$2,$3, make_str("set storage"),$6); }
1386-
/* ALTER TABLE <relation> DROP [COLUMN] <colname> {RESTRICT|CASCADE}*/
1389+
/* ALTER TABLE <name> DROP [COLUMN] <colname> {RESTRICT|CASCADE}*/
13871390
|DROPopt_columnColIdopt_drop_behavior
13881391
{$$ = cat_str(4, make_str("drop"),$2,$3,$4); }
1389-
/* ALTER TABLE <relation> ALTER [COLUMN] <colname> TYPE <typename> [ USING <expression> ]*/
1392+
/* ALTER TABLE <name> ALTER [COLUMN] <colname> TYPE <typename> [ USING <expression> ]*/
13901393
|ALTERopt_columnColIdTYPE_PTypenamealter_using
13911394
{$$ = cat_str(6, make_str("alter"),$2,$3, make_str("type"),$5,$6); }
1392-
/* ALTER TABLE <relation> ADD CONSTRAINT ...*/
1395+
/* ALTER TABLE <name> ADD CONSTRAINT ...*/
13931396
|ADD_PTableConstraint
13941397
{$$ = cat_str(2, make_str("add"),$2); }
1395-
/* ALTER TABLE <relation> DROP CONSTRAINT ...*/
1398+
/* ALTER TABLE <name> DROP CONSTRAINT ...*/
13961399
|DROPCONSTRAINTnameopt_drop_behavior
13971400
{$$ = cat_str(3, make_str("drop constraint"),$3,$4); }
1398-
/* ALTER TABLE <relation> SET WITHOUT OIDS*/
1401+
/* ALTER TABLE <name> SET WITHOUT OIDS*/
13991402
|SETWITHOUTOIDS
14001403
{$$ = make_str("set without oids"); }
14011404
/* ALTER TABLE <name> CLUSTER ON <indexname>*/
@@ -1446,20 +1449,10 @@ alter_table_cmd:
14461449
/* ALTER TABLE <name> NO INHERITS <parent>*/
14471450
|NOINHERITqualified_name
14481451
{$$ = cat2_str(make_str("no inherit"),$3); }
1449-
|alter_rel_cmd
1450-
{$$ =$1; }
1451-
;
1452-
1453-
alter_rel_cmds:alter_rel_cmd {$$ =$1; }
1454-
|alter_rel_cmds','alter_rel_cmd{$$ = cat_str(3,$1, make_str(","),$3); }
1455-
;
1456-
1457-
/* Subcommands that are for ALTER TABLE or ALTER INDEX*/
1458-
alter_rel_cmd:
1459-
/* ALTER [TABLE|INDEX] <name> OWNER TO RoleId*/
1460-
OWNERTORoleId
1452+
/* ALTER <name> OWNER TO RoleId*/
1453+
|OWNERTORoleId
14611454
{$$ = cat2_str(make_str("owner to"),$3); }
1462-
/* ALTER[TABLE|INDEX]<name> SET TABLESPACE <tablespacename>*/
1455+
/* ALTER <name> SET TABLESPACE <tablespacename>*/
14631456
|SETTABLESPACEname
14641457
{$$ = cat2_str(make_str("set tablespace"),$3); }
14651458
|SETdefinition
@@ -1830,19 +1823,23 @@ CreateAsElement: ColId { $$ = $1; }
18301823
*
18311824
*****************************************************************************/
18321825

1833-
CreateSeqStmt:CREATEOptTempSEQUENCEqualified_nameOptSeqList
1826+
CreateSeqStmt:CREATEOptTempSEQUENCEqualified_nameOptSeqOptList
18341827
{$$ = cat_str(5, make_str("create"),$2, make_str("sequence"),$4,$5); }
18351828
;
18361829

1837-
AlterSeqStmt:ALTERSEQUENCEqualified_nameOptSeqList
1830+
AlterSeqStmt:ALTERSEQUENCErelation_exprSeqOptList
18381831
{$$ = cat_str(3,make_str("alter sequence"),$3,$4); }
18391832
;
18401833

1841-
OptSeqList:OptSeqListOptSeqElem{$$ = cat2_str($1,$2); }
1842-
|/*EMPTY*/{$$ = EMPTY; }
1834+
OptSeqOptList:SeqOptList{$$ =$1; }
1835+
|/*EMPTY*/{$$ = EMPTY; }
1836+
;
1837+
1838+
SeqOptList:SeqOptElem{$$ =$1; }
1839+
|SeqOptListSeqOptElem{$$ = cat2_str($1,$2); }
18431840
;
18441841

1845-
OptSeqElem:CACHENumConst
1842+
SeqOptElem:CACHENumConst
18461843
{$$ = cat2_str(make_str("cache"),$2); }
18471844
|CYCLE
18481845
{$$ = make_str("cycle"); }
@@ -2841,6 +2838,8 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name
28412838
{$$ = cat_str(4, make_str("alter schema"),$3, make_str("rename to"),$6); }
28422839
|ALTERTABLErelation_exprRENAMETOname
28432840
{$$ = cat_str(4, make_str("alter table"),$3, make_str("rename to"),$6); }
2841+
|ALTERTABLErelation_exprSETSCHEMAname
2842+
{$$ = cat_str(4, make_str("alter table"),$3, make_str("set schema"),$6); }
28442843
|ALTERSEQUENCErelation_exprRENAMETOname
28452844
{$$ = cat_str(4, make_str("alter sequence"),$3, make_str("rename to"),$6); }
28462845
|ALTERVIEWrelation_exprRENAMETOname
@@ -2886,7 +2885,7 @@ AlterObjectSchemaStmt:
28862885
{$$ = cat_str(4, make_str("alter function"),$3, make_str("set schema"),$6); }
28872886
|ALTERSEQUENCErelation_exprSETSCHEMAname
28882887
{$$ = cat_str(4, make_str("alter sequence"),$3, make_str("set schema"),$6); }
2889-
|ALTERTABLErelation_exprSETSCHEMAname
2888+
|ALTERVIEWrelation_exprSETSCHEMAname
28902889
{$$ = cat_str(4, make_str("alter sequence"),$3, make_str("set schema"),$6); }
28912890
|ALTERTYPE_Pany_nameSETSCHEMAname
28922891
{$$ = cat_str(4, make_str("alter type"),$3, make_str("set schema"),$6); }

0 commit comments

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