Index: doc/src/sgml/catalogs.sgml
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v
retrieving revision 2.109
diff -c -r2.109 catalogs.sgml
*** doc/src/sgml/catalogs.sgml 26 Jul 2005 16:38:25 -0000 2.109
--- doc/src/sgml/catalogs.sgml 30 Jul 2005 18:48:10 -0000
***************
*** 1019,1024 ****
--- 1019,1035 ----
+ rolconnlimit
+ int4
+
+
+ For roles that can login this sets maximum amount of concurrent
+ connections this role can make. Default value (-1) means
+ unlimited connections, zero (0) means role can't login.
+
+
+
+
rolpassword
text
***************
*** 1922,1927 ****
--- 1933,1949 ----
+ datconnlimit
+ int4
+
+
+ Sets maximum amount of concurrent connections that can be made
+ to this database. Default value (-1) means unlimited connections,
+ zero (0) means that database isn't accepting connections.
+
+
+
+
datlastsysoid
oid
***************
*** 4812,4817 ****
--- 4834,4850 ----
+ rolconnlimit
+ int4
+
+
+ For roles that can login this sets maximum amount of concurrent
+ connections this role can make. Default value (-1) means
+ unlimited connections, zero (0) means role can't login.
+
+
+
+
rolpassword
text
***************
*** 5094,5099 ****
--- 5127,5143 ----
+ useconnlimit
+ int4
+
+
+ This sets maximum amount of concurrent connections this user can make.
+ Default value (-1) means unlimited connections,
+ zero (0) means user can't login.
+
+
+
+
passwd
text
Index: doc/src/sgml/ref/alter_database.sgml
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/ref/alter_database.sgml,v
retrieving revision 1.15
diff -c -r1.15 alter_database.sgml
*** doc/src/sgml/ref/alter_database.sgml 5 Jan 2005 14:22:39 -0000 1.15
--- doc/src/sgml/ref/alter_database.sgml 30 Jul 2005 18:48:11 -0000
***************
*** 23,28 ****
--- 23,34 ----
ALTER DATABASE name SET parameter { TO | = } { value | DEFAULT }
ALTER DATABASE name RESET parameter
+ ALTER DATABASE name [ [ WITH ] option [ ... ] ]
+
+ where option can be:
+
+ CONNECTION LIMIT connlimit
+
ALTER DATABASE name RENAME TO newname
ALTER DATABASE name OWNER TO new_owner
***************
*** 51,57 ****
! The third form changes the name of the database. Only the database
owner or a superuser can rename a database; non-superuser owners must
also have the
CREATEDB privilege. The current database cannot
--- 57,68 ----
! The third form changes certain per-database settings. (See below for
! details.) Only database owner or superuser can change these settings.
!
!
!
! The fourth form changes the name of the database. Only the database
owner or a superuser can rename a database; non-superuser owners must
also have the
CREATEDB privilege. The current database cannot
***************
*** 60,66 ****
! The fourth form changes the owner of the database. Only a superuser
can change the database's owner.
--- 71,77 ----
! The fifth form changes the owner of the database. Only a superuser
can change the database's owner.
***************
*** 100,105 ****
--- 111,128 ----
+
+ connlimit
+
+
+ Number specifying how many concurrent connections can be made
+ to this database. Default (-1) means unlimited
+ (limited by max_connections config variable only),
+ zero (0) means that no connections are allowed.
+
+
+
+
newname
Index: doc/src/sgml/ref/alter_role.sgml
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/ref/alter_role.sgml,v
retrieving revision 1.1
diff -c -r1.1 alter_role.sgml
*** doc/src/sgml/ref/alter_role.sgml 26 Jul 2005 23:24:02 -0000 1.1
--- doc/src/sgml/ref/alter_role.sgml 30 Jul 2005 18:48:12 -0000
***************
*** 30,35 ****
--- 30,36 ----
| CREATEUSER | NOCREATEUSER
| INHERIT | NOINHERIT
| LOGIN | NOLOGIN
+ | CONNECTION LIMIT connlimit
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'
| VALID UNTIL 'timestamp'
***************
*** 118,123 ****
--- 119,135 ----
NOINHERIT
LOGIN
NOLOGIN
+ CONNECTION LIMIT connlimit
+
+
+ If role can login, this specifies many concurrent connections
+ role can make. Default (-1) means unlimited
+ (limited by max_connections config variable only),
+ zero (0) means that role can't connect to server.
+
+
+
+
PASSWORD password
ENCRYPTED
UNENCRYPTED
***************
*** 225,230 ****
--- 237,250 ----
+ Set role's maximum connections:
+
+
+ ALTER ROLE peter WITH CONNECTION LIMIT 20;
+
+
+
+
Give a role a non-default setting of the
parameter:
Index: doc/src/sgml/ref/alter_user.sgml
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v
retrieving revision 1.38
diff -c -r1.38 alter_user.sgml
*** doc/src/sgml/ref/alter_user.sgml 26 Jul 2005 23:24:02 -0000 1.38
--- doc/src/sgml/ref/alter_user.sgml 30 Jul 2005 18:48:12 -0000
***************
*** 30,35 ****
--- 30,36 ----
| CREATEUSER | NOCREATEUSER
| INHERIT | NOINHERIT
| LOGIN | NOLOGIN
+ | CONNECTION LIMIT connlimit
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'
| VALID UNTIL 'timestamp'
Index: doc/src/sgml/ref/create_database.sgml
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v
retrieving revision 1.43
diff -c -r1.43 create_database.sgml
*** doc/src/sgml/ref/create_database.sgml 29 Oct 2004 03:17:22 -0000 1.43
--- doc/src/sgml/ref/create_database.sgml 30 Jul 2005 18:48:12 -0000
***************
*** 24,30 ****
[ [ WITH ] [ OWNER [=] dbowner ]
[ TEMPLATE [=] template ]
[ ENCODING [=] encoding ]
! [ TABLESPACE [=] tablespace ] ]
--- 24,31 ----
[ [ WITH ] [ OWNER [=] dbowner ]
[ TEMPLATE [=] template ]
[ ENCODING [=] encoding ]
! [ TABLESPACE [=] tablespace ]
! [ CONNECTION LIMIT [=] connlimit ] ]
***************
*** 123,128 ****
--- 124,140 ----
+
+ connlimit
+
+
+ Number specifying how many concurrent connections can be made
+ to this database. Default (-1) means unlimited
+ (limited by max_connections config variable only),
+ zero (0) means that no connections are allowed.
+
+
+
Index: doc/src/sgml/ref/create_role.sgml
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/ref/create_role.sgml,v
retrieving revision 1.1
diff -c -r1.1 create_role.sgml
*** doc/src/sgml/ref/create_role.sgml 26 Jul 2005 23:24:02 -0000 1.1
--- doc/src/sgml/ref/create_role.sgml 30 Jul 2005 18:48:13 -0000
***************
*** 30,35 ****
--- 30,36 ----
| CREATEUSER | NOCREATEUSER
| INHERIT | NOINHERIT
| LOGIN | NOLOGIN
+ | CONNECTION LIMIT connlimit
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'
| VALID UNTIL 'timestamp'
| IN ROLE rolename [, ...]
***************
*** 173,178 ****
--- 174,191 ----
+ CONNECTION LIMIT connlimit
+
+
+ If role can login, this specifies many concurrent connections
+ role can make. Default (-1) means unlimited
+ (limited by max_connections config variable only),
+ zero (0) means that role can't connect to server.
+
+
+
+
+
PASSWORD password
Index: doc/src/sgml/ref/create_user.sgml
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/ref/create_user.sgml,v
retrieving revision 1.37
diff -c -r1.37 create_user.sgml
*** doc/src/sgml/ref/create_user.sgml 26 Jul 2005 23:24:02 -0000 1.37
--- doc/src/sgml/ref/create_user.sgml 30 Jul 2005 18:48:13 -0000
***************
*** 30,35 ****
--- 30,36 ----
| CREATEUSER | NOCREATEUSER
| INHERIT | NOINHERIT
| LOGIN | NOLOGIN
+ | CONNECTION LIMIT connlimit
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'
| VALID UNTIL 'timestamp'
| IN ROLE rolename [, ...]