diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-06-15 01:25:54 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-06-15 01:25:54 +0000 |
commit | a0b012a1ab85ae115f30e5e4fe09922b4885fdad (patch) | |
tree | 135f60e46a2a1a7cf7c07fbc062ea5417adaf797 /src/backend/tcop/utility.c | |
parent | bd2ef8707f27af1da91f4b4926e71e13e2b13149 (diff) |
Rearrange ALTER TABLE syntax processing as per my recent proposal: the
grammar allows ALTER TABLE/INDEX/SEQUENCE/VIEW interchangeably for all
subforms of those commands, and then we sort out what's really legal
at execution time. This allows the ALTER SEQUENCE/VIEW reference pages
to fully document all the ALTER forms available for sequences and views
respectively, and eliminates a longstanding cause of confusion for users.
The net effect is that the following forms are allowed that weren't before:
ALTER SEQUENCE OWNER TO
ALTER VIEW ALTER COLUMN SET/DROP DEFAULT
ALTER VIEW OWNER TO
ALTER VIEW SET SCHEMA
(There's no actual functionality gain here, but formerly you had to say
ALTER TABLE instead.)
Interestingly, the grammar tables actually get smaller, probably because
there are fewer special cases to keep track of.
I did not disallow using ALTER TABLE for these operations. Perhaps we
should, but there's a backwards-compatibility issue if we do; in fact
it would break existing pg_dump scripts. I did however tighten up
ALTER SEQUENCE and ALTER VIEW to reject non-sequences and non-views
in the new cases as well as a couple of cases where they didn't before.
The patch doesn't change pg_dump to use the new syntaxes, either.
Diffstat (limited to 'src/backend/tcop/utility.c')
-rw-r--r-- | src/backend/tcop/utility.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 6c839650b43..1922ffc960d 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.293 2008/06/14 18:04:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.294 2008/06/15 01:25:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1454,6 +1454,9 @@ CreateCommandTag(Node *parsetree) case OBJECT_TSCONFIGURATION: tag = "ALTER TEXT SEARCH CONFIGURATION"; break; + case OBJECT_VIEW: + tag = "ALTER VIEW"; + break; default: tag = "???"; break; @@ -1512,19 +1515,23 @@ CreateCommandTag(Node *parsetree) break; case T_AlterTableStmt: + switch (((AlterTableStmt *) parsetree)->relkind) { - AlterTableStmt *stmt = (AlterTableStmt *) parsetree; - - /* - * We might be supporting ALTER INDEX here, so set the - * completion tag appropriately. Catch all other possibilities - * with ALTER TABLE - */ - - if (stmt->relkind == OBJECT_INDEX) - tag = "ALTER INDEX"; - else + case OBJECT_TABLE: tag = "ALTER TABLE"; + break; + case OBJECT_INDEX: + tag = "ALTER INDEX"; + break; + case OBJECT_SEQUENCE: + tag = "ALTER SEQUENCE"; + break; + case OBJECT_VIEW: + tag = "ALTER VIEW"; + break; + default: + tag = "???"; + break; } break; |