From a55898131e0c68efc5836a6cada8e34e47678b71 Mon Sep 17 00:00:00 2001 From: Neil Conway Date: Tue, 3 Jul 2007 01:30:37 +0000 Subject: [PATCH] Add ALTER VIEW ... RENAME TO, and a RENAME TO clause to ALTER SEQUENCE. Sequences and views could previously be renamed using ALTER TABLE, but this was a repeated source of confusion for users. Update the docs, and psql tab completion. Patch from David Fetter; various minor fixes by myself. --- doc/src/sgml/ref/allfiles.sgml | 3 +- doc/src/sgml/ref/alter_sequence.sgml | 29 ++++++++---- doc/src/sgml/ref/alter_view.sgml | 88 ++++++++++++++++++++++++++++++++++++ doc/src/sgml/ref/create_view.sgml | 3 +- doc/src/sgml/ref/drop_view.sgml | 3 +- doc/src/sgml/reference.sgml | 3 +- src/backend/commands/alter.c | 8 +++- src/backend/commands/tablecmds.c | 26 +++++++++-- src/backend/parser/gram.y | 20 +++++++- src/backend/tcop/utility.c | 8 +++- src/bin/psql/tab-complete.c | 14 ++++-- src/include/commands/tablecmds.h | 5 +- 12 files changed, 184 insertions(+), 26 deletions(-) create mode 100644 doc/src/sgml/ref/alter_view.sgml diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index 90ad9adc53..3e08b55bab 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -1,5 +1,5 @@ @@ -25,6 +25,7 @@ Complete list of usable sgml source files in this directory. + diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml index 37c2ceb631..c2bc3cd8bf 100644 --- a/doc/src/sgml/ref/alter_sequence.sgml +++ b/doc/src/sgml/ref/alter_sequence.sgml @@ -1,5 +1,5 @@ @@ -29,6 +29,7 @@ ALTER SEQUENCE name [ INCREMENT [ B [ RESTART [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ] [ OWNED BY { table.column | NONE } ] ALTER SEQUENCE name SET SCHEMA new_schema +ALTER SEQUENCE name RENAME TO new_name @@ -182,14 +183,24 @@ ALTER SEQUENCE name SET SCHEMA - - new_schema - - - The new schema for the sequence. - - - + + new_schema + + + The new schema for the sequence. + + + + + + new_name + + + The new name for the sequence. + + + + diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml new file mode 100644 index 0000000000..62723c7096 --- /dev/null +++ b/doc/src/sgml/ref/alter_view.sgml @@ -0,0 +1,88 @@ + + + + + ALTER VIEW + SQL - Language Statements + + + + ALTER VIEW + change the definition of a view + + + + ALTER VIEW + + + + +ALTER VIEW name RENAME TO newname + + + + + Description + + + ALTER VIEW changes the definition of a + view. To execute this command you must be the owner of the view. + + + + + Parameters + + + + name + + + The name (optionally schema-qualified) of an existing view. + + + + + + newname + + + The new name of the view. + + + + + + + + Examples + + + To rename the view foo to + bar: + +ALTER VIEW foo RENAME TO bar; + + + + + Compatibility + + + ALTER VIEW is a PostgreSQL + extension of the SQL standard. + + + + + See Also + + + + + + + diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml index f1466c8678..1ad50f05d2 100644 --- a/doc/src/sgml/ref/create_view.sgml +++ b/doc/src/sgml/ref/create_view.sgml @@ -1,5 +1,5 @@ @@ -226,6 +226,7 @@ CREATE VIEW name [ ( See Also + diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml index 03a8d4aa0e..b531c6d235 100644 --- a/doc/src/sgml/ref/drop_view.sgml +++ b/doc/src/sgml/ref/drop_view.sgml @@ -1,5 +1,5 @@ @@ -104,6 +104,7 @@ DROP VIEW kinds; See Also + diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index 06699a5b34..a52fe7a964 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -1,4 +1,4 @@ - + Reference @@ -53,6 +53,7 @@ &alterTrigger; &alterType; &alterUser; + &alterView; &analyze; &begin; &checkpoint; diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index 118e4adb16..7cd347b69f 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.23 2007/03/26 16:58:38 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.24 2007/07/03 01:30:36 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -83,6 +83,8 @@ ExecRenameStmt(RenameStmt *stmt) break; case OBJECT_TABLE: + case OBJECT_SEQUENCE: + case OBJECT_VIEW: case OBJECT_INDEX: case OBJECT_COLUMN: case OBJECT_TRIGGER: @@ -96,6 +98,8 @@ ExecRenameStmt(RenameStmt *stmt) switch (stmt->renameType) { case OBJECT_TABLE: + case OBJECT_SEQUENCE: + case OBJECT_VIEW: case OBJECT_INDEX: { /* @@ -113,7 +117,7 @@ ExecRenameStmt(RenameStmt *stmt) aclcheck_error(aclresult, ACL_KIND_NAMESPACE, get_namespace_name(namespaceId)); - renamerel(relid, stmt->newname); + renamerel(relid, stmt->newname, stmt->renameType); break; } case OBJECT_COLUMN: diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index f50b59d0d8..4bc2a25fcd 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.228 2007/06/23 22:12:50 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.229 2007/07/03 01:30:36 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -41,6 +41,7 @@ #include "executor/executor.h" #include "miscadmin.h" #include "nodes/makefuncs.h" +#include "nodes/parsenodes.h" #include "optimizer/clauses.h" #include "optimizer/plancat.h" #include "optimizer/prep.h" @@ -1621,7 +1622,7 @@ renameatt(Oid myrelid, * sequence, AFAIK there's no need for it to be there. */ void -renamerel(Oid myrelid, const char *newrelname) +renamerel(Oid myrelid, const char *newrelname, ObjectType reltype) { Relation targetrelation; Relation relrelation; /* for RELATION relation */ @@ -1633,8 +1634,8 @@ renamerel(Oid myrelid, const char *newrelname) bool relhastriggers; /* - * Grab an exclusive lock on the target table or index, which we will NOT - * release until end of transaction. + * Grab an exclusive lock on the target table, index, sequence or + * view, which we will NOT release until end of transaction. */ targetrelation = relation_open(myrelid, AccessExclusiveLock); @@ -1647,7 +1648,24 @@ renamerel(Oid myrelid, const char *newrelname) errmsg("permission denied: \"%s\" is a system catalog", RelationGetRelationName(targetrelation)))); + /* + * For compatibility with prior releases, we don't complain if + * ALTER TABLE or ALTER INDEX is used to rename a sequence or + * view. + */ relkind = targetrelation->rd_rel->relkind; + if (reltype == OBJECT_SEQUENCE && relkind != 'S') + ereport(ERROR, + (errcode(ERRCODE_WRONG_OBJECT_TYPE), + errmsg("\"%s\" is not a sequence", + RelationGetRelationName(targetrelation)))); + + if (reltype == OBJECT_VIEW && relkind != 'v') + ereport(ERROR, + (errcode(ERRCODE_WRONG_OBJECT_TYPE), + errmsg("\"%s\" is not a view", + RelationGetRelationName(targetrelation)))); + relhastriggers = (targetrelation->rd_rel->reltriggers > 0); /* diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index d9e981bb57..324f89a256 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.596 2007/06/23 22:12:51 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.597 2007/07/03 01:30:36 neilc Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -4546,6 +4546,24 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name n->newname = $6; $$ = (Node *)n; } + | ALTER SEQUENCE relation_expr RENAME TO name + { + RenameStmt *n = makeNode(RenameStmt); + n->renameType = OBJECT_SEQUENCE; + n->relation = $3; + n->subname = NULL; + n->newname = $6; + $$ = (Node *)n; + } + | ALTER VIEW relation_expr RENAME TO name + { + RenameStmt *n = makeNode(RenameStmt); + n->renameType = OBJECT_VIEW; + n->relation = $3; + n->subname = NULL; + n->newname = $6; + $$ = (Node *)n; + } | ALTER INDEX relation_expr RENAME TO name { RenameStmt *n = makeNode(RenameStmt); diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index a01c99b005..ec9aa9d263 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.282 2007/06/28 00:02:39 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.283 2007/07/03 01:30:37 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -1574,6 +1574,9 @@ CreateCommandTag(Node *parsetree) case OBJECT_SCHEMA: tag = "ALTER SCHEMA"; break; + case OBJECT_SEQUENCE: + tag = "ALTER SEQUENCE"; + break; case OBJECT_COLUMN: case OBJECT_TABLE: tag = "ALTER TABLE"; @@ -1584,6 +1587,9 @@ CreateCommandTag(Node *parsetree) case OBJECT_TRIGGER: tag = "ALTER TRIGGER"; break; + case OBJECT_VIEW: + tag = "ALTER VIEW"; + break; default: tag = "???"; break; diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index a30a07501f..9a9e952ac9 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.165 2007/06/13 23:59:47 neilc Exp $ + * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.166 2007/07/03 01:30:37 neilc Exp $ */ /*---------------------------------------------------------------------- @@ -602,7 +602,7 @@ psql_completion(char *text, int start, int end) static const char *const list_ALTER[] = {"AGGREGATE", "CONVERSION", "DATABASE", "DOMAIN", "FUNCTION", "GROUP", "INDEX", "LANGUAGE", "OPERATOR", "ROLE", "SCHEMA", "SEQUENCE", "TABLE", - "TABLESPACE", "TRIGGER", "TYPE", "USER", NULL}; + "TABLESPACE", "TRIGGER", "TYPE", "USER", "VIEW", NULL}; COMPLETE_WITH_LIST(list_ALTER); } @@ -714,7 +714,7 @@ psql_completion(char *text, int start, int end) { static const char *const list_ALTERSEQUENCE[] = {"INCREMENT", "MINVALUE", "MAXVALUE", "RESTART", "NO", "CACHE", "CYCLE", - "SET SCHEMA", NULL}; + "SET SCHEMA", "RENAME TO", NULL}; COMPLETE_WITH_LIST(list_ALTERSEQUENCE); } @@ -728,6 +728,14 @@ psql_completion(char *text, int start, int end) COMPLETE_WITH_LIST(list_ALTERSEQUENCE2); } + /* ALTER VIEW */ + else if (pg_strcasecmp(prev3_wd, "ALTER") == 0 && + pg_strcasecmp(prev2_wd, "VIEW") == 0) + { + static const char *const list_ALTERVIEW[] = {"RENAME TO", NULL}; + + COMPLETE_WITH_LIST(list_ALTERVIEW); + } /* ALTER TRIGGER , add ON */ else if (pg_strcasecmp(prev3_wd, "ALTER") == 0 && pg_strcasecmp(prev2_wd, "TRIGGER") == 0) diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index 3acbe84b52..44df10ceb3 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.33 2007/05/11 20:17:10 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.34 2007/07/03 01:30:37 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,8 @@ extern void renameatt(Oid myrelid, bool recursing); extern void renamerel(Oid myrelid, - const char *newrelname); + const char *newrelname, + ObjectType reltype); extern void find_composite_type_dependencies(Oid typeOid, const char *origTblName, -- 2.11.0