aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2002-02-25 02:53:46 +0000
committerBruce Momjian <bruce@momjian.us>2002-02-25 02:53:46 +0000
commit95ec9ff2f7fd7f3058daf02071101152cec89e0c (patch)
tree119d32e16825f602b289cc845fdac4f2fdbe3e06
parentc3fe58ed63d02ca8d31dfa50b8786495883415d7 (diff)
downloadpostgresql-95ec9ff2f7fd7f3058daf02071101152cec89e0c.tar.gz
postgresql-95ec9ff2f7fd7f3058daf02071101152cec89e0c.zip
Remove documentation of equals in CREATE DATABASE. Mention removal of
equals hack for the future.
-rw-r--r--doc/src/sgml/ref/create_database.sgml19
-rw-r--r--src/backend/parser/gram.y6
2 files changed, 14 insertions, 11 deletions
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index 2c87d215914..0ee73e37265 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.24 2002/02/24 20:20:18 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.25 2002/02/25 02:53:46 momjian Exp $
PostgreSQL documentation
-->
@@ -24,10 +24,10 @@ PostgreSQL documentation
</refsynopsisdivinfo>
<synopsis>
CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
- [ WITH [ OWNER [ = ] <replaceable class="parameter">dbowner</replaceable> ]
- [ LOCATION [ = ] '<replaceable class="parameter">dbpath</replaceable>' ]
- [ TEMPLATE [ = ] <replaceable class="parameter">template</replaceable> ]
- [ ENCODING [ = ] <replaceable class="parameter">encoding</replaceable> ] ]
+ [ WITH [ OWNER <replaceable class="parameter">dbowner</replaceable> ]
+ [ LOCATION '<replaceable class="parameter">dbpath</replaceable>' ]
+ [ TEMPLATE <replaceable class="parameter">template</replaceable> ]
+ [ ENCODING <replaceable class="parameter">encoding</replaceable> ] ]
</synopsis>
<refsect2 id="R2-SQL-CREATEDATABASE-1">
@@ -186,11 +186,10 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
<para>
Normally, the creator becomes the owner of the new database.
- A different owner may be specified by using the <option>OWNER</>
- clause (but only superusers may create databases on behalf of other users).
- To create a database owned by oneself, either superuser privilege
- or CREATEDB privilege is required. A superuser may create a database
- for another user, even if that user has no special privileges himself.
+ Superusers can create databases owned by other users using the
+ <option>OWNER</> clause. They can even create databases owned by
+ users with no special privileges. Non-superusers with CREATEDB
+ privilege can only create databases owned by themselves.
</para>
<para>
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 37d9364eae8..66c11828b65 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.279 2002/02/24 20:20:20 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.280 2002/02/25 02:53:46 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -3155,6 +3155,10 @@ createdb_opt_item: LOCATION opt_equal Sconst
}
;
+/*
+ * Optional equals is here only for backward compatibility.
+ * Should be removed someday. bjm 2002-02-24
+ */
opt_equal: '=' { $$ = TRUE; }
| /*EMPTY*/ { $$ = FALSE; }
;