Skip to content

P
Postgres FD Implementation
Commit dfdff4e0 authored by Thomas G. Lockhart's avatar Thomas G. Lockhart
Browse files
Options

First workaround solution for Jan's column constraint attributes.

parent 58a9ea9d
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 129 deletions
src/backend/parser/gram.y
View file @ dfdff4e0
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.144 2000/02/18 09:29:40 inoue Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.145 2000/02/19 08:25:49 thomas Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -263,14 +263,15 @@ static Node *doNegate(Node *n); ...@@ -263,14 +263,15 @@ static Node *doNegate(Node *n);
%type <str> TypeId %type <str> TypeId
%type <node> TableConstraint %type <node> TableConstraint
%type <list> ColPrimaryKey, ColQualList, ColQualifier %type <list> ColQualList, ColQualifier
%type <list> ColQualListWithNull %type <list> ColQualListWithNull
%type <node> ColConstraint, ColConstraintElem %type <node> ColConstraint, ColConstraintElem, PrimaryKey, NotNull
%type <node> DefaultClause, DefaultExpr
%type <node> ColConstraintWithNull, ColConstraintElemWithNull %type <node> ColConstraintWithNull, ColConstraintElemWithNull
%type <ival> key_actions, key_action, key_reference %type <ival> key_actions, key_delete, key_update, key_reference
%type <str> key_match %type <str> key_match
%type <ival> ConstraintAttributeSpec, ConstraintDeferrabilitySpec, %type <ival> ConstraintAttribute, DeferrabilityClause,
ConstraintTimeSpec TimeClause
%type <list> constraints_set_list %type <list> constraints_set_list
%type <list> constraints_set_namelist %type <list> constraints_set_namelist
...@@ -1028,40 +1029,132 @@ OptTableElement: columnDef { $$ = $1; } ...@@ -1028,40 +1029,132 @@ OptTableElement: columnDef { $$ = $1; }
| TableConstraint { $$ = $1; } | TableConstraint { $$ = $1; }
; ;
columnDef: ColId Typename ColQualifier columnDef: ColId Typename ColQualifier opt_collate
{ {
ColumnDef *n = makeNode(ColumnDef); ColumnDef *n = makeNode(ColumnDef);
n->colname = $1; n->colname = $1;
n->typename = $2; n->typename = $2;
#if 0
n->raw_default = NULL; n->raw_default = NULL;
n->cooked_default = NULL; n->cooked_default = NULL;
n->is_not_null = FALSE; n->is_not_null = FALSE;
#endif
n->constraints = $3; n->constraints = $3;
if ($4 != NULL)
elog(NOTICE,"CREATE TABLE/COLLATE %s not yet implemented"
"; clause ignored", $4);
$$ = (Node *)n; $$ = (Node *)n;
} }
| ColId SERIAL ColPrimaryKey | ColId SERIAL PrimaryKey
{ {
ColumnDef *n = makeNode(ColumnDef); ColumnDef *n = makeNode(ColumnDef);
n->colname = $1; n->colname = $1;
n->typename = makeNode(TypeName); n->typename = makeNode(TypeName);
n->typename->name = xlateSqlType("integer"); n->typename->name = xlateSqlType("integer");
n->typename->typmod = -1; n->typename->typmod = -1;
#if 0
n->raw_default = NULL; n->raw_default = NULL;
n->cooked_default = NULL; n->cooked_default = NULL;
#endif
n->is_not_null = TRUE; n->is_not_null = TRUE;
n->is_sequence = TRUE; n->is_sequence = TRUE;
n->constraints = $3; n->constraints = lcons($3, NIL);
$$ = (Node *)n; $$ = (Node *)n;
} }
; ;
ColQualifier: ColQualList { $$ = $1; } /*
| NULL_P ColQualListWithNull { $$ = $2; } * ColQualifier encapsulates an entire column qualification,
| NULL_P { $$ = NULL; } * including DEFAULT, constraints, and constraint attributes.
* Note that the DefaultClause handles the empty case.
*/
ColQualifier: DefaultClause ColQualList
{
if ($1 != NULL)
$$ = lcons($1, $2);
else
$$ = $2;
}
| NotNull DefaultClause ColQualListWithNull
{
$$ = lcons($1, $3);
if ($2 != NULL)
$$ = lcons($2, $$);
}
| DefaultExpr NotNull ColQualListWithNull
{
$$ = lcons($2, $3);
if ($1 != NULL)
$$ = lcons($1, $$);
}
| DefaultExpr NotNull
{
$$ = lcons($2, NIL);
if ($1 != NULL)
$$ = lcons($1, $$);
}
| NotNull DefaultClause
{
$$ = lcons($1, NIL);
if ($2 != NULL)
$$ = lcons($2, $$);
}
| NULL_P DefaultClause ColQualListWithNull
{
$$ = $3;
if ($2 != NULL)
$$ = lcons($2, $$);
}
| NULL_P DefaultClause
{
if ($2 != NULL)
$$ = lcons($2, NIL);
else
$$ = NIL;
}
| DefaultClause
{
if ($1 != NULL)
$$ = lcons($1, NIL);
else
$$ = NIL;
}
;
/*
* DEFAULT expression must be b_expr not a_expr to prevent shift/reduce
* conflict on NOT (since NOT might start a subsequent NOT NULL constraint,
* or be part of a_expr NOT LIKE or similar constructs).
*/
DefaultClause: DefaultExpr { $$ = $1; }
| /*EMPTY*/ { $$ = NULL; } | /*EMPTY*/ { $$ = NULL; }
; ;
DefaultExpr: DEFAULT NULL_P
{
Constraint *n = makeNode(Constraint);
n->contype = CONSTR_DEFAULT;
n->name = NULL;
n->raw_expr = NULL;
n->cooked_expr = NULL;
n->keys = NULL;
$$ = (Node *)n;
}
| DEFAULT b_expr
{
Constraint *n = makeNode(Constraint);
n->contype = CONSTR_DEFAULT;
n->name = NULL;
n->raw_expr = $2;
n->cooked_expr = NULL;
n->keys = NULL;
$$ = (Node *)n;
}
;
ColQualList: ColQualList ColConstraint ColQualList: ColQualList ColConstraint
{ {
if ($2 != NULL) if ($2 != NULL)
...@@ -1078,12 +1171,12 @@ ColQualList: ColQualList ColConstraint ...@@ -1078,12 +1171,12 @@ ColQualList: ColQualList ColConstraint
} }
; ;
ColQualListWithNull: ColQualListWithNull ColConstraintWithNull ColQualListWithNull: ColConstraintWithNull ColQualListWithNull
{ {
if ($2 != NULL) if ($1 != NULL)
$$ = lappend($1, $2); $$ = lcons($1, $2);
else else
$$ = $1; $$ = $2;
} }
| ColConstraintWithNull | ColConstraintWithNull
{ {
...@@ -1094,21 +1187,7 @@ ColQualListWithNull: ColQualListWithNull ColConstraintWithNull ...@@ -1094,21 +1187,7 @@ ColQualListWithNull: ColQualListWithNull ColConstraintWithNull
} }
; ;
ColPrimaryKey: PRIMARY KEY ColConstraint: CONSTRAINT name ColConstraintElem
{
Constraint *n = makeNode(Constraint);
n->contype = CONSTR_PRIMARY;
n->name = NULL;
n->raw_expr = NULL;
n->cooked_expr = NULL;
n->keys = NULL;
$$ = lcons((Node *)n, NIL);
}
| /*EMPTY*/ { $$ = NULL; }
;
ColConstraint:
CONSTRAINT name ColConstraintElem
{ {
switch (nodeTag($3)) switch (nodeTag($3))
{ {
...@@ -1133,8 +1212,7 @@ ColConstraint: ...@@ -1133,8 +1212,7 @@ ColConstraint:
{ $$ = $1; } { $$ = $1; }
; ;
ColConstraintWithNull: ColConstraintWithNull: CONSTRAINT name ColConstraintElemWithNull
CONSTRAINT name ColConstraintElemWithNull
{ {
switch (nodeTag($3)) switch (nodeTag($3))
{ {
...@@ -1169,25 +1247,11 @@ ColConstraintWithNull: ...@@ -1169,25 +1247,11 @@ ColConstraintWithNull:
* that a column may have that value. WITH NULL leads to * that a column may have that value. WITH NULL leads to
* shift/reduce conflicts with WITH TIME ZONE anyway. * shift/reduce conflicts with WITH TIME ZONE anyway.
* - thomas 1999-01-08 * - thomas 1999-01-08
*
* DEFAULT expression must be b_expr not a_expr to prevent shift/reduce
* conflict on NOT (since NOT might start a subsequent NOT NULL constraint,
* or be part of a_expr NOT LIKE or similar constructs).
*/ */
ColConstraintElem: ColConstraintElemWithNull ColConstraintElem: ColConstraintElemWithNull
{ {
$$ = $1; $$ = $1;
} }
| NOT NULL_P
{
Constraint *n = makeNode(Constraint);
n->contype = CONSTR_NOTNULL;
n->name = NULL;
n->raw_expr = NULL;
n->cooked_expr = NULL;
n->keys = NULL;
$$ = (Node *)n;
}
| UNIQUE | UNIQUE
{ {
Constraint *n = makeNode(Constraint); Constraint *n = makeNode(Constraint);
...@@ -1198,15 +1262,9 @@ ColConstraintElem: ColConstraintElemWithNull ...@@ -1198,15 +1262,9 @@ ColConstraintElem: ColConstraintElemWithNull
n->keys = NULL; n->keys = NULL;
$$ = (Node *)n; $$ = (Node *)n;
} }
| PRIMARY KEY | PrimaryKey
{ {
Constraint *n = makeNode(Constraint); $$ = $1;
n->contype = CONSTR_PRIMARY;
n->name = NULL;
n->raw_expr = NULL;
n->cooked_expr = NULL;
n->keys = NULL;
$$ = (Node *)n;
} }
; ;
...@@ -1220,31 +1278,23 @@ ColConstraintElemWithNull: CHECK '(' a_expr ')' ...@@ -1220,31 +1278,23 @@ ColConstraintElemWithNull: CHECK '(' a_expr ')'
n->keys = NULL; n->keys = NULL;
$$ = (Node *)n; $$ = (Node *)n;
} }
| DEFAULT NULL_P | REFERENCES ColId opt_column_list
key_match key_actions ConstraintAttribute
{ {
Constraint *n = makeNode(Constraint); FkConstraint *n = makeNode(FkConstraint);
n->contype = CONSTR_DEFAULT; n->constr_name = NULL;
n->name = NULL; n->pktable_name = $2;
n->raw_expr = NULL; n->fk_attrs = NIL;
n->cooked_expr = NULL; n->pk_attrs = $3;
n->keys = NULL; n->match_type = $4;
$$ = (Node *)n; n->actions = $5;
} n->deferrable = (($6 & 1) != 0);
| DEFAULT b_expr n->initdeferred = (($6 & 2) != 0);
{
Constraint *n = makeNode(Constraint);
n->contype = CONSTR_DEFAULT;
n->name = NULL;
n->raw_expr = $2;
n->cooked_expr = NULL;
n->keys = NULL;
$$ = (Node *)n; $$ = (Node *)n;
} }
| REFERENCES ColId opt_column_list key_match key_actions | REFERENCES ColId opt_column_list
key_match key_actions
{ {
/* XXX
* Need ConstraintAttributeSpec as $6 -- Jan
*/
FkConstraint *n = makeNode(FkConstraint); FkConstraint *n = makeNode(FkConstraint);
n->constr_name = NULL; n->constr_name = NULL;
n->pktable_name = $2; n->pktable_name = $2;
...@@ -1254,14 +1304,33 @@ ColConstraintElemWithNull: CHECK '(' a_expr ')' ...@@ -1254,14 +1304,33 @@ ColConstraintElemWithNull: CHECK '(' a_expr ')'
n->actions = $5; n->actions = $5;
n->deferrable = true; n->deferrable = true;
n->initdeferred = false; n->initdeferred = false;
/*
n->deferrable = ($6 & 1) != 0;
n->initdeferred = ($6 & 2) != 0;
*/
$$ = (Node *)n; $$ = (Node *)n;
} }
; ;
PrimaryKey: PRIMARY KEY
{
Constraint *n = makeNode(Constraint);
n->contype = CONSTR_PRIMARY;
n->name = NULL;
n->raw_expr = NULL;
n->cooked_expr = NULL;
n->keys = NULL;
$$ = (Node *)n;
}
;
NotNull: NOT NULL_P
{
Constraint *n = makeNode(Constraint);
n->contype = CONSTR_NOTNULL;
n->name = NULL;
n->raw_expr = NULL;
n->cooked_expr = NULL;
n->keys = NULL;
$$ = (Node *)n;
}
/* ConstraintElem specifies constraint syntax which is not embedded into /* ConstraintElem specifies constraint syntax which is not embedded into
* a column definition. ColConstraintElem specifies the embedded form. * a column definition. ColConstraintElem specifies the embedded form.
* - thomas 1997-12-03 * - thomas 1997-12-03
...@@ -1310,17 +1379,14 @@ ConstraintElem: CHECK '(' a_expr ')' ...@@ -1310,17 +1379,14 @@ ConstraintElem: CHECK '(' a_expr ')'
n->keys = $3; n->keys = $3;
$$ = (Node *)n; $$ = (Node *)n;
} }
| PRIMARY KEY '(' columnList ')' | PrimaryKey '(' columnList ')'
{ {
Constraint *n = makeNode(Constraint); Constraint *n = (Constraint *)$1;
n->contype = CONSTR_PRIMARY; n->keys = $3;
n->name = NULL;
n->raw_expr = NULL;
n->cooked_expr = NULL;
n->keys = $4;
$$ = (Node *)n; $$ = (Node *)n;
} }
| FOREIGN KEY '(' columnList ')' REFERENCES ColId opt_column_list key_match key_actions ConstraintAttributeSpec | FOREIGN KEY '(' columnList ')' REFERENCES ColId opt_column_list
key_match key_actions ConstraintAttribute
{ {
FkConstraint *n = makeNode(FkConstraint); FkConstraint *n = makeNode(FkConstraint);
n->constr_name = NULL; n->constr_name = NULL;
...@@ -1333,6 +1399,20 @@ ConstraintElem: CHECK '(' a_expr ')' ...@@ -1333,6 +1399,20 @@ ConstraintElem: CHECK '(' a_expr ')'
n->initdeferred = ($11 & 2) != 0; n->initdeferred = ($11 & 2) != 0;
$$ = (Node *)n; $$ = (Node *)n;
} }
| FOREIGN KEY '(' columnList ')' REFERENCES ColId opt_column_list
key_match key_actions
{
FkConstraint *n = makeNode(FkConstraint);
n->constr_name = NULL;
n->pktable_name = $7;
n->fk_attrs = $4;
n->pk_attrs = $8;
n->match_type = $9;
n->actions = $10;
n->deferrable = false;
n->initdeferred = false;
$$ = (Node *)n;
}
; ;
key_match: MATCH FULL key_match: MATCH FULL
...@@ -1341,7 +1421,7 @@ key_match: MATCH FULL ...@@ -1341,7 +1421,7 @@ key_match: MATCH FULL
} }
| MATCH PARTIAL | MATCH PARTIAL
{ {
elog(ERROR, "FOREIGN KEY match type PARTIAL not implemented yet"); elog(ERROR, "FOREIGN KEY/MATCH PARTIAL not yet implemented");
$$ = "PARTIAL"; $$ = "PARTIAL";
} }
| /*EMPTY*/ | /*EMPTY*/
...@@ -1350,13 +1430,17 @@ key_match: MATCH FULL ...@@ -1350,13 +1430,17 @@ key_match: MATCH FULL
} }
; ;
key_actions: key_action key_action { $$ = $1 | $2; } key_actions: key_delete { $$ = $1; }
| key_action { $$ = $1; } | key_update { $$ = $1; }
| key_delete key_update { $$ = $1 | $2; }
| key_update key_delete { $$ = $1 | $2; }
| /*EMPTY*/ { $$ = 0; } | /*EMPTY*/ { $$ = 0; }
; ;
key_action: ON DELETE key_reference { $$ = $3 << FKCONSTR_ON_DELETE_SHIFT; } key_delete: ON DELETE key_reference { $$ = $3 << FKCONSTR_ON_DELETE_SHIFT; }
| ON UPDATE key_reference { $$ = $3 << FKCONSTR_ON_UPDATE_SHIFT; } ;
key_update: ON UPDATE key_reference { $$ = $3 << FKCONSTR_ON_UPDATE_SHIFT; }
; ;
key_reference: NO ACTION { $$ = FKCONSTR_ON_KEY_NOACTION; } key_reference: NO ACTION { $$ = FKCONSTR_ON_KEY_NOACTION; }
...@@ -1558,7 +1642,7 @@ CreateTrigStmt: CREATE TRIGGER name TriggerActionTime TriggerEvents ON ...@@ -1558,7 +1642,7 @@ CreateTrigStmt: CREATE TRIGGER name TriggerActionTime TriggerEvents ON
} }
| CREATE CONSTRAINT TRIGGER name AFTER TriggerEvents ON | CREATE CONSTRAINT TRIGGER name AFTER TriggerEvents ON
relation_name OptConstrFromTable relation_name OptConstrFromTable
ConstraintAttributeSpec ConstraintAttribute
FOR EACH ROW EXECUTE PROCEDURE name '(' TriggerFuncArgs ')' FOR EACH ROW EXECUTE PROCEDURE name '(' TriggerFuncArgs ')'
{ {
CreateTrigStmt *n = makeNode(CreateTrigStmt); CreateTrigStmt *n = makeNode(CreateTrigStmt);
...@@ -1658,41 +1742,37 @@ OptConstrFromTable: /* Empty */ ...@@ -1658,41 +1742,37 @@ OptConstrFromTable: /* Empty */
} }
; ;
ConstraintAttributeSpec: ConstraintDeferrabilitySpec ConstraintAttribute: DeferrabilityClause
{ $$ = $1; }
| ConstraintDeferrabilitySpec ConstraintTimeSpec
{ {
if ($1 == 0 && $2 != 0) $$ = $1;
elog(ERROR, "INITIALLY DEFERRED constraint must be DEFERRABLE");
$$ = $1 | $2;
} }
| ConstraintTimeSpec | TimeClause
{ {
if ($1 != 0) if ($1 != 0)
$$ = 3; $$ = 3;
else else
$$ = 0; $$ = 0;
} }
| ConstraintTimeSpec ConstraintDeferrabilitySpec | DeferrabilityClause TimeClause
{
if ($1 == 0 && $2 != 0)
elog(ERROR, "INITIALLY DEFERRED constraint must be DEFERRABLE");
$$ = $1 | $2;
}
| TimeClause DeferrabilityClause
{ {
if ($2 == 0 && $1 != 0) if ($2 == 0 && $1 != 0)
elog(ERROR, "INITIALLY DEFERRED constraint must be DEFERRABLE"); elog(ERROR, "INITIALLY DEFERRED constraint must be DEFERRABLE");
$$ = $1 | $2; $$ = $1 | $2;
} }
| /* Empty */
{ $$ = 0; }
; ;
ConstraintDeferrabilitySpec: NOT DEFERRABLE DeferrabilityClause: DEFERRABLE { $$ = 1; }
{ $$ = 0; } | NOT DEFERRABLE { $$ = 0; }
| DEFERRABLE
{ $$ = 1; }
; ;
ConstraintTimeSpec: INITIALLY IMMEDIATE TimeClause: INITIALLY IMMEDIATE { $$ = 0; }
{ $$ = 0; } | INITIALLY DEFERRED { $$ = 2; }
| INITIALLY DEFERRED
{ $$ = 2; }
; ;
...@@ -2734,18 +2814,7 @@ CreatedbStmt: CREATE DATABASE database_name WITH createdb_opt_location createdb ...@@ -2734,18 +2814,7 @@ CreatedbStmt: CREATE DATABASE database_name WITH createdb_opt_location createdb
n = makeNode(CreatedbStmt); n = makeNode(CreatedbStmt);
n->dbname = $3; n->dbname = $3;
n->dbpath = $5; n->dbpath = $5;
#ifdef MULTIBYTE n->encoding = $6;
if ($6 != NULL) {
n->encoding = pg_char_to_encoding($6);
if (n->encoding < 0) {
elog(ERROR, "Encoding name '%s' is invalid", $6);
}
} else {
n->encoding = GetTemplateEncoding();
}
#else
n->encoding = 0;
#endif
$$ = (Node *)n; $$ = (Node *)n;
} }
| CREATE DATABASE database_name | CREATE DATABASE database_name
...@@ -2795,7 +2864,7 @@ createdb_opt_encoding: ...@@ -2795,7 +2864,7 @@ createdb_opt_encoding:
#ifdef MULTIBYTE #ifdef MULTIBYTE
$$ = GetTemplateEncoding(); $$ = GetTemplateEncoding();
#else #else
$$ = -1; $$ = 0;
#endif #endif
} }
| /*EMPTY*/ | /*EMPTY*/
...@@ -2803,7 +2872,7 @@ createdb_opt_encoding: ...@@ -2803,7 +2872,7 @@ createdb_opt_encoding:
#ifdef MULTIBYTE #ifdef MULTIBYTE
$$ = GetTemplateEncoding(); $$ = GetTemplateEncoding();
#else #else
$$= -1; $$= 0;
#endif #endif
} }
; ;
...@@ -3935,7 +4004,7 @@ Character: character '(' Iconst ')' ...@@ -3935,7 +4004,7 @@ Character: character '(' Iconst ')'
} }
; ;
character: CHARACTER opt_varying opt_charset opt_collate character: CHARACTER opt_varying opt_charset
{ {
char *type, *c; char *type, *c;
if (($3 == NULL) || (strcasecmp($3, "sql_text") == 0)) { if (($3 == NULL) || (strcasecmp($3, "sql_text") == 0)) {
...@@ -3951,8 +4020,6 @@ character: CHARACTER opt_varying opt_charset opt_collate ...@@ -3951,8 +4020,6 @@ character: CHARACTER opt_varying opt_charset opt_collate
type = xlateSqlType($3); type = xlateSqlType($3);
} }
}; };
if ($4 != NULL)
elog(NOTICE,"COLLATE %s not yet implemented; clause ignored",$4);
$$ = type; $$ = type;
} }
| CHAR opt_varying { $$ = xlateSqlType($2? "varchar": "char"); } | CHAR opt_varying { $$ = xlateSqlType($2? "varchar": "char"); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment