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

Commit10f05d8

Browse files
committed
Merge ALTER GROUP ADD/DROP rules by creating add_drop action.
1 parentf91ee12 commit10f05d8

16 files changed

+19
-39317
lines changed

‎src/backend/parser/gram.y

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.324 2002/06/1705:40:32 momjian Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.325 2002/06/1707:00:24 momjian Exp $
1515
*
1616
* HISTORY
1717
* AUTHORDATEMAJOR EVENT
@@ -152,7 +152,7 @@ static void doNegateFloat(Value *v);
152152
simple_select
153153

154154
%type<node>alter_column_default
155-
%type<ival>drop_behavior,opt_drop_behavior
155+
%type<ival>add_drop,drop_behavior,opt_drop_behavior
156156

157157
%type<list>createdb_opt_list,createdb_opt_item
158158
%type<boolean>opt_equal
@@ -200,17 +200,19 @@ static void doNegateFloat(Value *v);
200200
%type<chr>TriggerOneEvent
201201

202202
%type<list>stmtblock,stmtmulti,
203-
OptTableElementList,OptInherit,definition,opt_distinct,
204-
opt_definition,func_args,func_args_list,func_as,createfunc_opt_list
203+
OptTableElementList,OptInherit,definition,
204+
opt_distinct,opt_definition,func_args,
205+
func_args_list,func_as,createfunc_opt_list
205206
oper_argtypes,RuleActionList,RuleActionMulti,
206207
opt_column_list,columnList,opt_name_list,
207-
sort_clause,sortby_list,index_params,index_list,name_list,
208-
from_clause,from_list,opt_array_bounds,qualified_name_list,
209-
any_name,any_name_list,any_operator,expr_list,dotted_name,attrs,
208+
sort_clause,sortby_list,index_params,index_list,
209+
name_list,from_clause,from_list,opt_array_bounds,
210+
qualified_name_list,any_name,any_name_list,
211+
any_operator,expr_list,dotted_name,attrs,
210212
target_list,update_target_list,insert_column_list,
211-
insert_target_list,
212-
def_list,opt_indirection,group_clause,TriggerFuncArgs,
213-
select_limit,opt_select_limit
213+
insert_target_list,def_list,opt_indirection,
214+
group_clause,TriggerFuncArgs,select_limit,
215+
opt_select_limit
214216

215217
%type<range>into_clause,OptTempTableName
216218

@@ -709,24 +711,20 @@ OptGroupElem: USER user_list
709711
*
710712
*****************************************************************************/
711713

712-
AlterGroupStmt:ALTERGROUP_PUserIdADDUSERuser_list
714+
AlterGroupStmt:ALTERGROUP_PUserIdadd_dropUSERuser_list
713715
{
714716
AlterGroupStmt *n = makeNode(AlterGroupStmt);
715717
n->name =$3;
716-
n->action = +1;
717-
n->listUsers =$6;
718-
$$ = (Node *)n;
719-
}
720-
|ALTERGROUP_PUserIdDROPUSERuser_list
721-
{
722-
AlterGroupStmt *n = makeNode(AlterGroupStmt);
723-
n->name =$3;
724-
n->action = -1;
718+
n->action =$4;
725719
n->listUsers =$6;
726720
$$ = (Node *)n;
727721
}
728722
;
729723

724+
add_drop:ADD{$$ = +1; }
725+
|DROP{$$ = -1; }
726+
;
727+
730728

731729
/*****************************************************************************
732730
*

‎src/backend/utils/adt/mac.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*PostgreSQL type definitions for MAC addresses.
33
*
4-
*$Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.23 2002/06/15 19:39:33 momjian Exp $
4+
*$Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.24 2002/06/17 07:00:26 momjian Exp $
55
*/
66

77
#include"postgres.h"
@@ -48,7 +48,6 @@ macaddr_in(PG_FUNCTION_ARGS)
4848
count=sscanf(str,"%2x%2x.%2x%2x.%2x%2x",&a,&b,&c,&d,&e,&f);
4949
if (count!=6)
5050
count=sscanf(str,"%2x%2x%2x%2x%2x%2x",&a,&b,&c,&d,&e,&f);
51-
5251
if (count!=6)
5352
elog(ERROR,"macaddr_in: error in parsing \"%s\"",str);
5453

‎src/test/regress/data/agg.data

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
567.8
2-
10099.097
3-
00.09561
4-
42324.78

‎src/test/regress/data/constrf.data

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
5!check failed6
2-
7check failed6

‎src/test/regress/data/constro.data

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
4!check failed5
2-
6OK4

0 commit comments

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