10
10
*
11
11
*
12
12
* IDENTIFICATION
13
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.38 1997/08/21 01:34:44 vadim Exp $
13
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.39 1997/08/22 03:17:55 vadim Exp $
14
14
*
15
15
* HISTORY
16
16
* AUTHOR DATE MAJOR EVENT
@@ -84,7 +84,7 @@ static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
84
84
Attr *attr;
85
85
86
86
ColumnDef *coldef;
87
- ConstaintDef *constrdef;
87
+ ConstraintDef *constrdef;
88
88
TypeName *typnam;
89
89
DefElem *defelt;
90
90
ParamString *param;
@@ -352,7 +352,8 @@ columnDef: Id Typename OptDefault opt_null
352
352
}
353
353
;
354
354
355
- OptDefault: DEFAULT default_expr {
355
+ OptDefault: DEFAULT default_expr
356
+ {
356
357
int deflen = CurScanPosition() - DefaultStartPosition;
357
358
char *defval;
358
359
@@ -453,8 +454,7 @@ default_expr_list: default_expr_or_null
453
454
{ $$ = lappend($1, $3); }
454
455
;
455
456
456
- opt_null: PNULL { $$ = false; }
457
- | NOT PNULL { $$ = true; }
457
+ opt_null: NOT PNULL { $$ = true; }
458
458
| NOTNULL { $$ = true; }
459
459
| /* EMPTY */ { $$ = false; }
460
460
;
@@ -610,7 +610,7 @@ ConstraintElem:
610
610
;
611
611
612
612
ConstraintDef: CHECK a_expr {
613
- ConstaintDef *constr = palloc (sizeof(ConstaintDef ));
613
+ ConstraintDef *constr = palloc (sizeof(ConstraintDef ));
614
614
int chklen = CurScanPosition() - CheckStartPosition;
615
615
char *check;
616
616
@@ -621,7 +621,7 @@ ConstraintDef: CHECK a_expr {
621
621
check[chklen] = 0;
622
622
constr->type = CONSTR_CHECK;
623
623
constr->name = NULL;
624
- constr->expr = check;
624
+ constr->def = (void*) check;
625
625
$$ = constr;
626
626
}
627
627
;
0 commit comments