diff options
author | Neil Conway | 2007-07-03 01:30:37 +0000 |
---|---|---|
committer | Neil Conway | 2007-07-03 01:30:37 +0000 |
commit | bec4fc2ab7e479fe88701fc445327406bcc04086 (patch) | |
tree | 57bcd54938f5caf6933e457bbf42854718fcd705 | |
parent | 826c259a76ce62a55a12ed35559d9d35dc2bc7c4 (diff) |
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.
-rw-r--r-- | doc/src/sgml/ref/allfiles.sgml | 1 | ||||
-rw-r--r-- | doc/src/sgml/ref/alter_sequence.sgml | 27 | ||||
-rw-r--r-- | doc/src/sgml/ref/alter_view.sgml | 88 | ||||
-rw-r--r-- | doc/src/sgml/ref/create_view.sgml | 1 | ||||
-rw-r--r-- | doc/src/sgml/ref/drop_view.sgml | 1 | ||||
-rw-r--r-- | doc/src/sgml/reference.sgml | 1 | ||||
-rw-r--r-- | src/backend/commands/alter.c | 6 | ||||
-rw-r--r-- | src/backend/commands/tablecmds.c | 24 | ||||
-rw-r--r-- | src/backend/parser/gram.y | 18 | ||||
-rw-r--r-- | src/backend/tcop/utility.c | 6 | ||||
-rw-r--r-- | src/bin/psql/tab-complete.c | 12 | ||||
-rw-r--r-- | src/include/commands/tablecmds.h | 3 |
12 files changed, 173 insertions, 15 deletions
diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index 8bfa76aed8..f2c4e2f21e 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -25,6 +25,7 @@ Complete list of usable sgml source files in this directory. <!entity alterTrigger system "alter_trigger.sgml"> <!entity alterType system "alter_type.sgml"> <!entity alterUser system "alter_user.sgml"> +<!entity alterView system "alter_view.sgml"> <!entity analyze system "analyze.sgml"> <!entity begin system "begin.sgml"> <!entity checkpoint system "checkpoint.sgml"> diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml index 56a9c57d4b..394ab885b4 100644 --- a/doc/src/sgml/ref/alter_sequence.sgml +++ b/doc/src/sgml/ref/alter_sequence.sgml @@ -29,6 +29,7 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> [ INCREMENT [ B [ RESTART [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ] [ OWNED BY { <replaceable class="parameter">table</replaceable>.<replaceable class="parameter">column</replaceable> | NONE } ] ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable> +ALTER SEQUENCE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -182,14 +183,24 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <rep </listitem> </varlistentry> - <varlistentry> - <term><replaceable class="parameter">new_schema</replaceable></term> - <listitem> - <para> - The new schema for the sequence. - </para> - </listitem> - </varlistentry> + <varlistentry> + <term><replaceable class="parameter">new_schema</replaceable></term> + <listitem> + <para> + The new schema for the sequence. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><replaceable class="parameter">new_name</replaceable></term> + <listitem> + <para> + The new name for the sequence. + </para> + </listitem> + </varlistentry> + </variablelist> </para> </refsect1> diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml new file mode 100644 index 0000000000..2057d02cd8 --- /dev/null +++ b/doc/src/sgml/ref/alter_view.sgml @@ -0,0 +1,88 @@ +<!-- +$PostgreSQL$ +PostgreSQL documentation +--> + +<refentry id="SQL-ALTERVIEW"> + <refmeta> + <refentrytitle id="SQL-ALTERVIEW-TITLE">ALTER VIEW</refentrytitle> + <refmiscinfo>SQL - Language Statements</refmiscinfo> + </refmeta> + + <refnamediv> + <refname>ALTER VIEW</refname> + <refpurpose>change the definition of a view</refpurpose> + </refnamediv> + + <indexterm zone="sql-alterview"> + <primary>ALTER VIEW</primary> + </indexterm> + + <refsynopsisdiv> +<synopsis> +ALTER VIEW <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> +</synopsis> + </refsynopsisdiv> + + <refsect1> + <title>Description</title> + + <para> + <command>ALTER VIEW</command> changes the definition of a + view. To execute this command you must be the owner of the view. + </para> + </refsect1> + + <refsect1> + <title>Parameters</title> + + <variablelist> + <varlistentry> + <term><replaceable class="parameter">name</replaceable></term> + <listitem> + <para> + The name (optionally schema-qualified) of an existing view. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><replaceable class="parameter">newname</replaceable></term> + <listitem> + <para> + The new name of the view. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1> + <title>Examples</title> + + <para> + To rename the view <literal>foo</literal> to + <literal>bar</literal>: +<programlisting> +ALTER VIEW foo RENAME TO bar; +</programlisting> + </para> + + <refsect1> + <title>Compatibility</title> + + <para> + <command>ALTER VIEW</command> is a <productname>PostgreSQL</> + extension of the SQL standard. + </para> + </refsect1> + + <refsect1> + <title>See Also</title> + + <simplelist type="inline"> + <member><xref linkend="sql-createview" endterm="sql-createview-title"></member> + <member><xref linkend="sql-dropview" endterm="sql-dropview-title"></member> + </simplelist> + </refsect1> +</refentry> diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml index 8bc51123b1..844857e98e 100644 --- a/doc/src/sgml/ref/create_view.sgml +++ b/doc/src/sgml/ref/create_view.sgml @@ -226,6 +226,7 @@ CREATE VIEW <replaceable class="parameter">name</replaceable> [ ( <replaceable c <title>See Also</title> <simplelist type="inline"> + <member><xref linkend="sql-alterview" endterm="sql-alterview-title"></member> <member><xref linkend="sql-dropview" endterm="sql-dropview-title"></member> </simplelist> </refsect1> diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml index 20a4145e4f..0adde5edf5 100644 --- a/doc/src/sgml/ref/drop_view.sgml +++ b/doc/src/sgml/ref/drop_view.sgml @@ -104,6 +104,7 @@ DROP VIEW kinds; <title>See Also</title> <simplelist type="inline"> + <member><xref linkend="sql-alterview" endterm="sql-alterview-title"></member> <member><xref linkend="sql-createview" endterm="sql-createview-title"></member> </simplelist> </refsect1> diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index dc3f117161..9c8a55909b 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -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 94c241aced..8c441155bc 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -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 1cd3121a40..c940d3373e 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -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 43cfc9b88a..96b79b62a6 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -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 94a433bab4..a9963633aa 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -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 1e765a4838..2c96872481 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -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 <name> */ + 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 <name>, 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 b5e70716ca..fc25a4342d 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -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, |