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

Commitd3571c7

Browse files
author
Michael Meskes
committed
*** empty log message ***
1 parentaeef717 commitd3571c7

File tree

3 files changed

+67
-14
lines changed

3 files changed

+67
-14
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,3 +685,12 @@ Fri Oct 15 17:05:25 CEST 1999
685685
- Synced keyword.c.
686686
- Finished C parser changes, so initializers are correctly parsed.
687687
- Set ecpg version to 2.6.7
688+
689+
Mon Oct 25 09:28:17 CEST 1999
690+
691+
- Made sure Tom Lane's patches make it into my source tree.
692+
693+
Wed Oct 27 18:08:09 CEST 1999
694+
695+
- Synced preproc.y with gram.y.
696+
- Set ecpg version to 2.6.8

‎src/interfaces/ecpg/preproc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global
33

44
MAJOR_VERSION=2
55
MINOR_VERSION=6
6-
PATCHLEVEL=7
6+
PATCHLEVEL=8
77

88
CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION)\
99
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)\

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

Lines changed: 57 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ adjust_array(enum ECPGttype type_enum, int *dimension, int *length, int type_dim
775775

776776
%type<str>IconstFconstSconstTransactionStmtCreateStmtUserId
777777
%type<str>CreateAsElementOptCreateAsCreateAsListCreateAsStmt
778-
%type<str>OptInheritkey_referencekey_action
778+
%type<str>OptInheritkey_referencekey_actioncomment_text
779779
%type<str>key_matchColLabelSpecialRuleRelation
780780
%type<str>ColIdColQualifiercolumnDefColQualList
781781
%type<str>ColConstraintColConstraintElemNumericOnlyFloatOnly
@@ -827,16 +827,16 @@ adjust_array(enum ECPGttype type_enum, int *dimension, int *length, int type_dim
827827
%type<str>ViewStmtLoadStmtCreatedbStmtopt_database1opt_database2location
828828
%type<str>DestroydbStmtClusterStmtgranteeRevokeStmtencoding
829829
%type<str>GrantStmtprivilegesoperation_commalistoperation
830-
%type<str>opt_cursoropt_lmodeConstraintsSetStmt
830+
%type<str>opt_cursoropt_lmodeConstraintsSetStmtcomment_tg
831831
%type<str>case_exprwhen_clause_listcase_defaultcase_argwhen_clause
832832
%type<str>select_clauseopt_select_limitselect_limit_value
833833
%type<str>select_offset_valuetable_listusing_exprjoin_expr
834834
%type<str>using_listfrom_exprtable_exprjoin_clausejoin_type
835835
%type<str>join_qualupdate_listjoin_clausejoin_clause_with_union
836836
%type<str>opt_levelopt_locklock_typeOptConstrTrigDeferrable,
837-
%type<str>OptConstrTrigInitdeferredOptConstrFromTable
838-
%type<str>constraints_set_listconstraints_set_namelist
839-
%type<str>constraints_set_mode
837+
%type<str>OptConstrTrigInitdeferredOptConstrFromTablecomment_op
838+
%type<str>constraints_set_listconstraints_set_namelistcomment_fn
839+
%type<str>constraints_set_modecomment_typecomment_clcomment_ag
840840

841841
%type<str>ECPGWheneverECPGConnectconnection_targetECPGOpenopt_using
842842
%type<str>indicatorECPGExecuteecpg_exprECPGPrepare
@@ -1895,21 +1895,65 @@ opt_portal_name: IN name{ $$ = cat2_str(make1_str("in"), $2); }
18951895

18961896
/*****************************************************************************
18971897
*
1898-
* QUERY:
1899-
* comment on [ table <relname> | column <relname>.<attribu
1900-
* is 'text'
1898+
* The COMMENT ON statement can take different forms based upon the type of
1899+
* the object associated with the comment. The form of the statement is:
1900+
*
1901+
* COMMENT ON [ [ DATABASE | INDEX | RULE | SEQUENCE | TABLE | TYPE | VIEW ]
1902+
* <objname> | AGGREGATE <aggname> <aggtype> | FUNCTION
1903+
* <funcname> (arg1, arg2, ...) | OPERATOR <op>
1904+
* (leftoperand_typ rightoperand_typ) | TRIGGER <triggername> ON
1905+
* <relname> ] IS 'text'
19011906
*
19021907
*****************************************************************************/
1903-
CommentStmt:COMMENTONCOLUMNrelation_name'.'attr_nameISSconst
1908+
CommentStmt:COMMENTONcomment_typenameIScomment_text
19041909
{
1905-
cat2_str(cat5_str(make1_str("comment on column"), $4, make1_str(","), $6, make1_str("is")), $8);
1910+
$$ =cat5_str(make1_str("comment on"),$3,$4, make1_str("is"),$6);
19061911
}
1907-
|COMMENTONTABLErelation_nameISSconst
1912+
|COMMENTONcomment_clrelation_name'.'attr_nameIScomment_text
1913+
{
1914+
$$ = cat3_str(cat5_str(make1_str("comment on"),$3,$4, make1_str("."),$6), make1_str("is"),$8);
1915+
}
1916+
|COMMENTONcomment_agnameaggr_argtypeIScomment_text
1917+
{
1918+
cat2_str(cat5_str(make1_str("comment on"), $3, $4, $5, make1_str("is")), $7);
1919+
}
1920+
|COMMENTONcomment_fnfunc_namefunc_argsIScomment_text
1921+
{
1922+
cat2_str(cat5_str(make1_str("comment on"), $3, $4, $5, make1_str("is")), $7);
1923+
}
1924+
|COMMENTONcomment_opall_Op'('oper_argtypes')'IScomment_text
1925+
{
1926+
cat3_str(cat5_str(make1_str("comment on"), $3, $4, make1_str("("), $6), make1_str(") is"), $9);
1927+
}
1928+
|COMMENTONcomment_tgnameONrelation_nameIScomment_text
19081929
{
1909-
cat4_str(make1_str("comment on table"), $4, make1_str("is"), $6);
1930+
cat3_str(cat5_str(make1_str("comment on"), $3, $4, make1_str("on"), $6), make1_str("is"), $8);
19101931
}
19111932
;
1912-
1933+
1934+
comment_type:DATABASE {$$ = make1_str("database"); }
1935+
|INDEX{$$ = make1_str("idnex"); }
1936+
|RULE{$$ = make1_str("rule"); }
1937+
|SEQUENCE{$$ = make1_str("sequence"); }
1938+
|TABLE{$$ = make1_str("table"); }
1939+
|TYPE_P{$$ = make1_str("type"); }
1940+
|VIEW{$$ = make1_str("view"); }
1941+
;
1942+
1943+
comment_cl:COLUMN{$$ = make1_str("column"); }
1944+
1945+
comment_ag:AGGREGATE{$$ = make1_str("aggregate"); }
1946+
1947+
comment_fn:FUNCTION{$$ = make1_str("function"); }
1948+
1949+
comment_op:OPERATOR{$$ = make1_str("operator"); }
1950+
1951+
comment_tg:TRIGGER{$$ = make1_str("trigger"); }
1952+
1953+
comment_text:Sconst{$$ =$1; }
1954+
|NULL_P{$$ = make1_str("null"); }
1955+
;
1956+
19131957
/*****************************************************************************
19141958
*
19151959
*QUERY:

0 commit comments

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