diff options
| author | Tom Lane | 2003-06-06 15:04:03 +0000 |
|---|---|---|
| committer | Tom Lane | 2003-06-06 15:04:03 +0000 |
| commit | e649796f128bd8702ba5744d36f4e8cb81f0b754 (patch) | |
| tree | 050eda51ad8f0298731316ccf61db2c01a2863a3 /src/backend/commands | |
| parent | 2c93861f7cef99b4613abd37ed7e4c15a95754b4 (diff) | |
Implement outer-level aggregates to conform to the SQL spec, with
extensions to support our historical behavior. An aggregate belongs
to the closest query level of any of the variables in its argument,
or the current query level if there are no variables (e.g., COUNT(*)).
The implementation involves adding an agglevelsup field to Aggref,
and treating outer aggregates like outer variables at planning time.
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/tablecmds.c | 6 | ||||
| -rw-r--r-- | src/backend/commands/typecmds.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 349fb8f3917..c463c8bd1b7 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.73 2003/05/28 16:03:56 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.74 2003/06/06 15:04:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2870,9 +2870,9 @@ AlterTableAddCheckConstraint(Relation rel, Constraint *constr) /* * No subplans or aggregates, either... */ - if (contain_subplans(expr)) + if (pstate->p_hasSubLinks) elog(ERROR, "cannot use subselect in CHECK constraint expression"); - if (contain_agg_clause(expr)) + if (pstate->p_hasAggs) elog(ERROR, "cannot use aggregate function in CHECK constraint expression"); /* diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index 2036b9e714a..5a16e53e983 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.36 2003/05/09 23:01:45 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.37 2003/06/06 15:04:01 tgl Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -1720,9 +1720,9 @@ domainAddConstraint(Oid domainOid, Oid domainNamespace, Oid baseTypeOid, /* * No subplans or aggregates, either... */ - if (contain_subplans(expr)) + if (pstate->p_hasSubLinks) elog(ERROR, "cannot use subselect in CHECK constraint expression"); - if (contain_agg_clause(expr)) + if (pstate->p_hasAggs) elog(ERROR, "cannot use aggregate function in CHECK constraint expression"); /* |