Index: doc/src/sgml/arch-dev.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/arch-dev.sgml,v retrieving revision 2.16 diff -c -r2.16 arch-dev.sgml *** doc/src/sgml/arch-dev.sgml 21 Nov 2001 05:53:40 -0000 2.16 --- doc/src/sgml/arch-dev.sgml 17 Jan 2003 18:18:36 -0000 *************** *** 478,485 **** For information on the syntax and creation of rules in the ! PostgreSQL system refer to ! The PostgreSQL User's Guide. --- 478,485 ---- For information on the syntax and creation of rules in the ! PostgreSQL system refer to the ! &cite-user;. Index: doc/src/sgml/catalogs.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/catalogs.sgml,v retrieving revision 2.64 diff -c -r2.64 catalogs.sgml *** doc/src/sgml/catalogs.sgml 17 Dec 2002 17:41:30 -0000 2.64 --- doc/src/sgml/catalogs.sgml 17 Jan 2003 18:16:59 -0000 *************** *** 288,296 **** New aggregate functions are registered with the CREATE ! AGGREGATE command. See the Programmer's ! Guide for more information about writing aggregate ! functions and the meaning of the transition functions, etc. --- 288,296 ---- New aggregate functions are registered with the CREATE ! AGGREGATE command. See the &cite-programmer; for more ! information about writing aggregate functions and the meaning of ! the transition functions, etc. *************** *** 1446,1453 **** The pg_database catalog stores information about the available databases. Databases are created with the CREATE DATABASE command. Consult the ! Administrator's Guide for details about the ! meaning of some of the parameters. --- 1446,1453 ---- The pg_database catalog stores information about the available databases. Databases are created with the CREATE DATABASE command. Consult the ! &cite-admin; for details about the meaning of some of the ! parameters. *************** *** 1791,1798 **** This catalog defines groups and stores what users belong to what groups. Groups are created with the CREATE ! GROUP command. Consult the Administrator's ! Guide for information about user permission management. --- 1791,1798 ---- This catalog defines groups and stores what users belong to what groups. Groups are created with the CREATE ! GROUP command. Consult the &cite-admin; for information ! about user permission management. *************** *** 2022,2029 **** pg_language registers call interfaces or languages in which you can write functions or stored procedures. See under CREATE LANGUAGE and in the ! Programmer's Guide for more information ! about language handlers. --- 2022,2028 ---- pg_language registers call interfaces or languages in which you can write functions or stored procedures. See under CREATE LANGUAGE and in the ! &cite-programmer; for more information about language handlers.
*************** *** 2298,2305 **** ! Operator classes are described at length in the ! Programmer's Guide.
--- 2297,2303 ---- ! Operator classes are described at length in the &cite-programmer;.
*************** *** 2387,2395 **** pg_operator ! See CREATE OPERATOR and the ! Programmer's Guide for details on these ! operator parameters.
--- 2385,2392 ---- pg_operator ! See CREATE OPERATOR and the &cite-programmer; ! for details on these operator parameters.
*************** *** 2559,2566 **** This catalog stores information about functions (or procedures). The description of CREATE FUNCTION and the ! Programmer's Guide contain more information ! about the meaning of some fields. --- 2556,2563 ---- This catalog stores information about functions (or procedures). The description of CREATE FUNCTION and the ! &cite-programmer; contain more information about the meaning of ! some fields. *************** *** 2832,2839 **** ! The Administrator's Guide contains detailed ! information about user and permission management. --- 2829,2836 ---- ! The &cite-admin; contains detailed information about user and ! permission management. Index: doc/src/sgml/charset.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/charset.sgml,v retrieving revision 2.30 diff -c -r2.30 charset.sgml *** doc/src/sgml/charset.sgml 15 Nov 2002 03:11:15 -0000 2.30 --- doc/src/sgml/charset.sgml 17 Jan 2003 18:21:17 -0000 *************** *** 309,316 **** PostgreSQL speak their preferred language well. If messages in your language is currently not available or fully translated, your assistance would be appreciated. If you want to ! help, refer to the Developer's Guide or write to the ! developers' mailing list. --- 309,316 ---- PostgreSQL speak their preferred language well. If messages in your language is currently not available or fully translated, your assistance would be appreciated. If you want to ! help, refer to the &cite-developer; or write to the developers' ! mailing list. Index: doc/src/sgml/client-auth.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/client-auth.sgml,v retrieving revision 1.43 diff -c -r1.43 client-auth.sgml *** doc/src/sgml/client-auth.sgml 6 Jan 2003 03:18:26 -0000 1.43 --- doc/src/sgml/client-auth.sgml 17 Jan 2003 17:51:03 -0000 *************** *** 110,117 **** This record matches connection attempts using TCP/IP networks. Note that TCP/IP connections are disabled unless the server is started with the option or the ! tcpip_socket postgresql.conf ! configuration parameter is enabled. --- 110,116 ---- This record matches connection attempts using TCP/IP networks. Note that TCP/IP connections are disabled unless the server is started with the option or the ! tcpip_socket configuration parameter is enabled. *************** *** 129,137 **** To be able make use of this option the server must be built with SSL support enabled. Furthermore, SSL must be enabled by ! enabling the option ssl in ! postgresql.conf (see ). --- 128,135 ---- To be able make use of this option the server must be built with SSL support enabled. Furthermore, SSL must be enabled by ! enabling the ssl configuration parameter ! (see for more information). *************** *** 191,198 **** must be zero for the record to match. (Of course IP addresses can be spoofed but this consideration is beyond the scope of PostgreSQL.) If you machine supports ! IPv6, the default pg_hba.conf will have an IPv6 ! entry for localhost. You can add your own IPv6 entries to the file. IPv6 entries are used only for IPv6 connections. --- 189,196 ---- must be zero for the record to match. (Of course IP addresses can be spoofed but this consideration is beyond the scope of PostgreSQL.) If you machine supports ! IPv6, the default pg_hba.conf file will have an ! IPv6 entry for localhost. You can add your own IPv6 entries to the file. IPv6 entries are used only for IPv6 connections. *************** *** 486,502 **** ! trust authentication is appropriate and very convenient ! for local connections on a single-user workstation. It is usually ! not appropriate by itself on a multiuser machine. ! However, you may be able to use trust even on a multiuser ! machine, if you restrict access to the postmaster's socket file using ! file-system permissions. To do this, set the parameter unix_socket_permissions (and possibly ! unix_socket_group) in postgresql.conf, ! as described in . Or you could ! set unix_socket_directory to place the socket file ! in a suitably restricted directory. --- 484,501 ---- ! trust authentication is appropriate and very ! convenient for local connections on a single-user workstation. It ! is usually not appropriate by itself on a multiuser ! machine. However, you may be able to use trust even ! on a multiuser machine, if you restrict access to the postmaster's ! socket file using file-system permissions. To do this, set the unix_socket_permissions (and possibly ! unix_socket_group) configuration parameters as ! described in . Or you ! could set the unix_socket_directory ! configuration parameter to place the socket file in a suitably ! restricted directory. Index: doc/src/sgml/dfunc.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/dfunc.sgml,v retrieving revision 1.22 diff -c -r1.22 dfunc.sgml *** doc/src/sgml/dfunc.sgml 21 Sep 2002 18:32:52 -0000 1.22 --- doc/src/sgml/dfunc.sgml 17 Jan 2003 18:22:11 -0000 *************** *** 318,326 **** -bI:.../lib/postgres.exp -bE:foo.exp foo.o \e -lm -lc 2>/dev/null .fi ! You should look at the PostgreSQL User's Manual ! for an explanation of this ! procedure. --> --- 318,325 ---- -bI:.../lib/postgres.exp -bE:foo.exp foo.o \e -lm -lc 2>/dev/null .fi ! You should look at the &cite-user; for an explanation of ! this procedure. --> Index: doc/src/sgml/ecpg.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ecpg.sgml,v retrieving revision 1.40 diff -c -r1.40 ecpg.sgml *** doc/src/sgml/ecpg.sgml 15 Nov 2002 03:11:16 -0000 1.40 --- doc/src/sgml/ecpg.sgml 17 Jan 2003 17:37:24 -0000 *************** *** 879,885 **** FETCH direction amount IN|FROM cursor Oracle ! Oracle, however, does not use the keywords IN or FROM. This feature cannot be added since it would create parsing conflicts. --- 879,885 ---- FETCH direction amount IN|FROM cursor Oracle ! Oracle, however, does not use the keywords IN or FROM. This feature cannot be added since it would create parsing conflicts. Index: doc/src/sgml/extend.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/extend.sgml,v retrieving revision 1.18 diff -c -r1.18 extend.sgml *** doc/src/sgml/extend.sgml 3 Nov 2002 01:31:32 -0000 1.18 --- doc/src/sgml/extend.sgml 17 Jan 2003 18:24:26 -0000 *************** *** 214,221 **** ! The Developer's Guide gives a more detailed explanation ! of these catalogs and their columns. However, shows the major entities and their relationships in the system catalogs. (Columns that do not refer --- 214,221 ---- ! The &cite-developer; gives a more detailed explanation of these ! catalogs and their columns. However, shows the major entities and their relationships in the system catalogs. (Columns that do not refer Index: doc/src/sgml/history.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/history.sgml,v retrieving revision 1.19 diff -c -r1.19 history.sgml *** doc/src/sgml/history.sgml 7 Jan 2002 02:29:12 -0000 1.19 --- doc/src/sgml/history.sgml 17 Jan 2003 20:55:06 -0000 *************** *** 3,9 **** --> ! A Short History of <productname>PostgreSQL</productname> The object-relational database management system now known as --- 3,9 ---- --> ! A Brief History of <productname>PostgreSQL</productname> The object-relational database management system now known as *************** *** 54,60 **** released in June 1990 with the new rule system. Version 3 appeared in 1991 and added support for multiple storage managers, an improved query executor, and a ! rewritten rewrite rule system. For the most part, subsequent releases until Postgres95 (see below) focused on portability and reliability. --- 54,60 ---- released in June 1990 with the new rule system. Version 3 appeared in 1991 and added support for multiple storage managers, an improved query executor, and a ! rewritten rule system. For the most part, subsequent releases until Postgres95 (see below) focused on portability and reliability. Index: doc/src/sgml/info.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/info.sgml,v retrieving revision 1.17 diff -c -r1.17 info.sgml *** doc/src/sgml/info.sgml 15 Nov 2002 03:11:16 -0000 1.17 --- doc/src/sgml/info.sgml 17 Jan 2003 18:25:10 -0000 *************** *** 71,78 **** Information for PostgreSQL developers. This is intended for those who are contributing to the PostgreSQL project; application ! development information appears in the Programmer's ! Guide. --- 71,77 ---- Information for PostgreSQL developers. This is intended for those who are contributing to the PostgreSQL project; application ! development information appears in the &cite-programmer;. *************** *** 88,95 **** man pages ! The Reference Manual's pages in the ! traditional Unix man format. There is no difference in content. --- 87,94 ---- man pages ! The &cite-reference;'s pages in the traditional Unix man ! format. There is no difference in content. Index: doc/src/sgml/installation.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/installation.sgml,v retrieving revision 1.127 diff -c -r1.127 installation.sgml *** doc/src/sgml/installation.sgml 11 Dec 2002 22:27:26 -0000 1.127 --- doc/src/sgml/installation.sgml 17 Jan 2003 18:32:33 -0000 *************** *** 656,663 **** internal header files and the server header files are installed into private directories under includedir. ! See the Programmer's Guide for ! information about how to get at the header files for each interface. Finally, a private subdirectory will also be created, if appropriate, under libdir for dynamically loadable modules. --- 656,663 ---- internal header files and the server header files are installed into private directories under includedir. ! See the &cite-programmer; for information about how to get at ! the header files for each interface. Finally, a private subdirectory will also be created, if appropriate, under libdir for dynamically loadable modules. *************** *** 1311,1318 **** The following is a quick summary of how to get PostgreSQL up and ! running once installed. The Administrator's Guide ! contains more information. --- 1311,1317 ---- The following is a quick summary of how to get PostgreSQL up and ! running once installed. The &cite-admin; contains more information. *************** *** 1418,1429 **** ! The Tutorial should be your first reading if you ! are completely new to SQL databases. ! If you are familiar with database concepts then you want to ! proceed with the Administrator's Guide, ! which contains information about how to set up the database ! server, database users, and authentication. --- 1417,1427 ---- ! The &cite-tutorial; should be your first reading if you are ! completely new to SQL databases. If you are ! familiar with database concepts then you want to proceed with ! the &cite-admin;, which contains information about how to set up ! the database server, database users, and authentication. *************** *** 1431,1438 **** Usually, you will want to modify your computer so that it will automatically start the database server whenever it boots. Some ! suggestions for this are in the Administrator's ! Guide. --- 1429,1435 ---- Usually, you will want to modify your computer so that it will automatically start the database server whenever it boots. Some ! suggestions for this are in the &cite-admin;. *************** *** 1441,1447 **** Run the regression tests against the installed server (using the sequential test method). If you didn't run the tests before installation, you should definitely do it now. This is also ! explained in the Administrator's Guide. --- 1438,1444 ---- Run the regression tests against the installed server (using the sequential test method). If you didn't run the tests before installation, you should definitely do it now. This is also ! explained in the &cite-admin;. Index: doc/src/sgml/jdbc.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/jdbc.sgml,v retrieving revision 1.41 diff -c -r1.41 jdbc.sgml *** doc/src/sgml/jdbc.sgml 15 Nov 2002 03:11:16 -0000 1.41 --- doc/src/sgml/jdbc.sgml 17 Jan 2003 18:33:16 -0000 *************** *** 124,132 **** Also, the client authentication setup in the pg_hba.conf file may need to be configured. ! Refer to the Administrator's Guide for ! details. The JDBC Driver supports the trust, ! ident, password, md5, and crypt authentication methods. --- 124,132 ---- Also, the client authentication setup in the pg_hba.conf file may need to be configured. ! Refer to the &cite-admin; for details. The ! JDBC Driver supports the trust, ident, ! password, md5, and crypt authentication methods. Index: doc/src/sgml/libpq.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/libpq.sgml,v retrieving revision 1.105 diff -c -r1.105 libpq.sgml *** doc/src/sgml/libpq.sgml 7 Jan 2003 04:25:29 -0000 1.105 --- doc/src/sgml/libpq.sgml 17 Jan 2003 18:33:33 -0000 *************** *** 952,958 **** escape a character, it is converted into the three digit octal number equal to the decimal ASCII value, and preceded by two backslashes. The single quote (') and backslash (\) characters have ! special alternate escape sequences. See the User's Guide for more information. PQescapeBytea performs this operation, escaping only the minimally required characters. --- 952,958 ---- escape a character, it is converted into the three digit octal number equal to the decimal ASCII value, and preceded by two backslashes. The single quote (') and backslash (\) characters have ! special alternate escape sequences. See the &cite-user; for more information. PQescapeBytea performs this operation, escaping only the minimally required characters. Index: doc/src/sgml/notation.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/notation.sgml,v retrieving revision 1.20 diff -c -r1.20 notation.sgml *** doc/src/sgml/notation.sgml 24 Oct 2002 17:48:54 -0000 1.20 --- doc/src/sgml/notation.sgml 17 Jan 2003 18:33:48 -0000 *************** *** 18,24 **** We use /usr/local/pgsql/ as the root directory of the installation and /usr/local/pgsql/data as the directory with the database files. These directories may vary ! on your site, details can be derived in the Administrator's Guide. --- 18,24 ---- We use /usr/local/pgsql/ as the root directory of the installation and /usr/local/pgsql/data as the directory with the database files. These directories may vary ! on your site, details can be derived in the &cite-admin;. Index: doc/src/sgml/plpgsql.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/plpgsql.sgml,v retrieving revision 1.13 diff -c -r1.13 plpgsql.sgml *** doc/src/sgml/plpgsql.sgml 15 Jan 2003 16:40:24 -0000 1.13 --- doc/src/sgml/plpgsql.sgml 17 Jan 2003 18:34:16 -0000 *************** *** 230,236 **** Developing in PL/pgSQL is pretty straight forward, especially if you have developed in other ! database procedural languages, such as Oracle's PL/SQL. One good way to develop in PL/pgSQL is to simply use the text editor of your choice to create your functions, and in another window, use --- 230,236 ---- Developing in PL/pgSQL is pretty straight forward, especially if you have developed in other ! database procedural languages, such as Oracle's PL/SQL. One good way to develop in PL/pgSQL is to simply use the text editor of your choice to create your functions, and in another window, use *************** *** 1155,1238 **** Returning from a function RETURN expression; ! RETURN with an expression is used to return ! from a PL/pgSQL function that does not return a ! set. The function terminates and the value of ! expression is returned to the caller. ! ! ! To return a composite (row) value, you must write a record or row ! variable as the expression. When ! returning a scalar type, any expression can be used. ! The expression's result will be automatically cast into the ! function's return type as described for assignments. ! (If you have declared the function to return void, ! then the expression can be omitted, and will be ignored in any case.) ! ! ! The return value of a function cannot be left undefined. If ! control reaches the end of the top-level block of the function ! without hitting a RETURN statement, a run-time ! error will occur. ! ! ! When a PL/pgSQL function is declared to return ! SETOF sometype, the procedure ! to follow is slightly different. In that case, the individual ! items to return are specified in RETURN NEXT ! commands, and then a final RETURN command with ! no arguments is used to indicate that the function has finished ! executing. RETURN NEXT can be used with both ! scalar and composite data types; in the later case, an entire ! "table" of results will be returned. Functions that use ! RETURN NEXT should be called in the following ! fashion: SELECT * FROM some_func(); ! That is, the function is used as a table source in a FROM clause. ! ! RETURN NEXT expression; ! ! RETURN NEXT does not actually return from the ! function; it simply saves away the value of the expression (or ! record or row variable, as appropriate for the data type being ! returned). Execution then continues with the next statement in ! the PL/pgSQL function. As successive ! RETURN NEXT commands are executed, the result ! set is built up. A final RETURN, which need ! have no argument, causes control to exit the function. ! ! ! ! The current implementation of RETURN NEXT for ! PL/pgSQL stores the entire result set before ! returning from the function, as discussed above. That means that ! if a PL/pgSQL function produces a very large result set, ! performance may be poor: data will be written to disk to avoid ! memory exhaustion, but the function itself will not return until ! the entire result set has been generated. A future version of ! PL/pgSQL may allow users to allow users to define set-returning ! functions that do not have this limitation. Currently, the point ! at which data begins being written to disk is controlled by the ! SORT_MEM configuration variable. Administrators who ! have sufficient memory to store larger result sets in memory ! should consider increasing this parameter. ! ! ! Conditionals --- 1155,1263 ---- Returning from a function + There are two commands available that allow you to return data + from a function: RETURN and RETURN + NEXT. + + + + <command>RETURN</> + + RETURN expression; ! RETURN with an expression is used to return ! from a PL/pgSQL function that does not return a ! set. The function terminates and the value of ! expression is returned to the caller. ! ! ! To return a composite (row) value, you must write a record or row ! variable as the expression. When ! returning a scalar type, any expression can be used. ! The expression's result will be automatically cast into the ! function's return type as described for assignments. ! ! ! The return value of a function cannot be left undefined. If ! control reaches the end of the top-level block of the function ! without hitting a RETURN statement, a run-time ! error will occur. Note that if you have declared the function to ! return void, a RETURN statement ! must still be specified; however, the expression following ! RETURN is optional, and will be ignored in ! any case. ! ! ! ! <command>RETURN NEXT</> ! ! ! RETURN NEXT expression; ! ! ! ! When a PL/pgSQL function is declared to return ! SETOF sometype, the procedure ! to follow is slightly different. In that case, the individual ! items to return are specified in RETURN NEXT ! commands, and then a final RETURN command ! with no arguments is used to indicate that the function has ! finished executing. RETURN NEXT can be used ! with both scalar and composite data types; in the later case, an ! entire table of results will be returned. ! Functions that use RETURN NEXT should be ! called in the following fashion: SELECT * FROM some_func(); ! That is, the function is used as a table source in a FROM ! clause. ! ! ! RETURN NEXT does not actually return from the ! function; it simply saves away the value of the expression (or ! record or row variable, as appropriate for the data type being ! returned). Execution then continues with the next statement in ! the PL/pgSQL function. As successive ! RETURN NEXT commands are executed, the result ! set is built up. A final RETURN, which should ! have no argument, causes control to exit the function. ! ! ! For more information on using set-returning functions in ! PostgreSQL, refer to XXX. ! ! ! The current implementation of RETURN NEXT ! for PL/pgSQL stores the entire result set ! before returning from the function, as discussed above. That ! means that if a PL/pgSQL function produces a ! very large result set, performance may be poor: data will be ! written to disk to avoid memory exhaustion, but the function ! itself will not return until the entire result set has been ! generated. A future version of PL/pgSQL may ! allow users to allow users to define set-returning functions ! that do not have this limitation. Currently, the point at ! which data begins being written to disk is controlled by the ! SORT_MEM configuration variable. Administrators ! who have sufficient memory to store larger result sets in ! memory should consider increasing this parameter. ! ! ! ! Conditionals *************** *** 1267,1275 **** END IF; ! IF-THEN statements are the simplest form of IF. The ! statements between THEN and END IF will be executed if ! the condition is true. Otherwise, they are skipped. IF v_user_id <> 0 THEN --- 1292,1302 ---- END IF; ! IF-THEN statements are the simplest form of ! IF. The statements between ! THEN and END IF will be ! executed if the condition is true. Otherwise, they are ! skipped. IF v_user_id <> 0 THEN *************** *** 1291,1299 **** END IF; ! IF-THEN-ELSE statements add to IF-THEN by letting you ! specify an alternative set of statements that should be executed if ! the condition evaluates to FALSE. IF parentid IS NULL or parentid = '''' --- 1318,1327 ---- END IF; ! IF-THEN-ELSE statements add to ! IF-THEN by letting you specify an ! alternative set of statements that should be executed if the ! condition evaluates to FALSE. IF parentid IS NULL or parentid = '''' *************** *** 1311,1324 **** return ''f''; END IF; ! ! <literal>IF-THEN-ELSE IF</> ! IF statements can be nested, as in the following example: IF demo_row.sex = ''m'' THEN pretty_sex := ''man''; --- 1339,1354 ---- return ''f''; END IF; ! ! <literal>IF-THEN-ELSE IF</> ! IF statements can be nested, as in the ! following example: ! IF demo_row.sex = ''m'' THEN pretty_sex := ''man''; *************** *** 1331,1342 **** ! When you use this form, you are actually ! nesting an IF statement inside the ELSE part of an outer IF ! statement. Thus you need one END IF statement for each ! nested IF and one for the parent IF-ELSE. ! This is workable but grows tedious when there are many ! alternatives to be checked. --- 1361,1373 ---- ! When you use this form, you are actually nesting an ! IF statement inside the ! ELSE part of an outer IF ! statement. Thus you need one END IF ! statement for each nested IF and one for the parent ! IF-ELSE. This is workable but grows ! tedious when there are many alternatives to be checked. *************** *** 1384,1390 **** ! The final ELSE section is optional. --- 1415,1421 ---- ! The final ELSE statement is optional. *************** *** 1399,1408 **** a series of commands. ! ! LOOP ! <<label>> LOOP --- 1430,1439 ---- a series of commands. ! ! LOOP ! <<label>> LOOP *************** *** 1410,1422 **** END LOOP; ! LOOP defines an unconditional loop that is repeated indefinitely ! until terminated by an EXIT or RETURN statement. ! The optional label can be used by ! EXIT statements in nested loops to specify which level of ! nesting should be terminated. ! ! EXIT --- 1441,1453 ---- END LOOP; ! LOOP defines an unconditional loop that is repeated indefinitely ! until terminated by an EXIT or RETURN ! statement. The optional label can be used by EXIT statements in ! nested loops to specify which level of nesting should be ! terminated. ! ! EXIT *************** *** 1547,1555 **** statements END LOOP; ! The record or row variable is successively assigned all the rows ! resulting from the SELECT query and the loop body is executed ! for each row. Here is an example: --- 1578,1586 ---- statements END LOOP; ! The record or row variable is successively assigned all the rows ! resulting from the SELECT query and the loop ! body is executed for each row. Here is an example: *************** *** 1639,1649 **** name CURSOR ( arguments ) FOR select_query ; ! (FOR may be replaced by IS for Oracle ! compatibility.) arguments, if any, ! are a comma-separated list of name ! datatype pairs that define names to ! be replaced by parameter values in the given query. The actual values to substitute for these names will be specified later, when the cursor is opened. --- 1670,1681 ---- name CURSOR ( arguments ) FOR select_query ; ! (FOR may be replaced by IS for ! Oracle compatibility.) ! arguments, if any, are a ! comma-separated list of name ! datatype pairs that define names to be ! replaced by parameter values in the given query. The actual values to substitute for these names will be specified later, when the cursor is opened. *************** *** 1685,1697 **** OPEN unbound-cursor FOR SELECT ...; ! The cursor variable is opened and given the specified query ! to execute. The cursor cannot be open already, and it must ! have been declared as an unbound cursor (that is, as a simple ! refcursor variable). The SELECT query is treated ! in the same way as other SELECT statements in PL/pgSQL: ! PL/pgSQL variable names are substituted, ! and the query plan is cached for possible re-use. OPEN curs1 FOR SELECT * FROM foo WHERE key = mykey; --- 1717,1730 ---- OPEN unbound-cursor FOR SELECT ...; ! The cursor variable is opened and given the specified query to ! execute. The cursor cannot be open already, and it must have been ! declared as an unbound cursor (that is, as a simple ! refcursor variable). The SELECT query ! is treated in the same way as other SELECT ! statements in PL/pgSQL: PL/pgSQL ! variable names are substituted, and the query plan is cached for ! possible re-use. OPEN curs1 FOR SELECT * FROM foo WHERE key = mykey; *************** *** 1799,1806 **** CLOSE cursor; ! CLOSE closes the Portal underlying an open cursor. ! This can be used to release resources earlier than end of transaction, or to free up the cursor variable to be opened again. --- 1832,1839 ---- CLOSE cursor; ! CLOSE closes the Portal underlying an open ! cursor. This can be used to release resources earlier than end of transaction, or to free up the cursor variable to be opened again. *************** *** 1815,1825 **** PL/pgSQL functions can return cursors to the ! caller. This is used to return multiple rows or columns from the ! function. The function opens the cursor and returns the cursor ! name to the caller. The caller can then FETCH rows from the ! cursor. The cursor can be closed by the caller, or it will be ! closed automatically when the transaction closes. --- 1848,1859 ---- PL/pgSQL functions can return cursors to the ! caller. This is used to return multiple rows or columns from ! the function. The function opens the cursor and returns the ! cursor name to the caller. The caller can then ! FETCH rows from the cursor. The cursor can ! be closed by the caller, or it will be closed automatically ! when the transaction closes. *************** *** 1879,1885 **** Errors and Messages ! Use the RAISE statement to report messages and raise errors. RAISE level 'format' , variable ...; --- 1913,1920 ---- Errors and Messages ! Use the RAISE statement to report messages and ! raise errors. RAISE level 'format' , variable ...; *************** *** 1896,1903 **** written to the server log, or both is controlled by the and configuration variables. See ! the PostgreSQL Administrator's Guide for more ! information. --- 1931,1937 ---- written to the server log, or both is controlled by the and configuration variables. See ! the &cite-admin; for more information. *************** *** 2029,2037 **** TG_LEVEL ! Data type text; a string of either ! ROW or STATEMENT depending on the ! trigger's definition. --- 2063,2071 ---- TG_LEVEL ! Data type text; a string of either ! ROW or STATEMENT ! depending on the trigger's definition. *************** *** 2040,2049 **** TG_OP ! Data type text; a string of ! INSERT, UPDATE ! or DELETE telling ! for which operation the trigger is fired. --- 2074,2083 ---- TG_OP ! Data type text; a string of ! INSERT, UPDATE or ! DELETE telling for which operation the ! trigger is fired. *************** *** 2282,2288 **** --> ! Porting from Oracle PL/SQL Oracle --- 2316,2322 ---- --> ! Porting from <productname>Oracle</productname> PL/SQL Oracle *************** *** 2300,2306 **** ! This section explains differences between Oracle's PL/SQL and PostgreSQL's PL/pgSQL languages in the hopes of helping developers port applications from Oracle to PostgreSQL. Most of the code here is from the ArsDigita --- 2334,2340 ---- ! This section explains differences between Oracle's PL/SQL and PostgreSQL's PL/pgSQL languages in the hopes of helping developers port applications from Oracle to PostgreSQL. Most of the code here is from the ArsDigita *************** *** 2322,2328 **** Main Differences ! Some things you should keep in mind when porting from Oracle to PostgreSQL: --- 2356,2363 ---- Main Differences ! Some things you should keep in mind when porting from ! Oracle to PostgreSQL: *************** *** 2479,2485 **** ! Here is an Oracle function: CREATE OR REPLACE FUNCTION cs_fmt_browser_version(v_name IN varchar, v_version IN varchar) RETURN varchar IS --- 2514,2520 ---- ! Here is an Oracle function: CREATE OR REPLACE FUNCTION cs_fmt_browser_version(v_name IN varchar, v_version IN varchar) RETURN varchar IS *************** *** 2508,2519 **** ! Oracle can have IN, OUT, ! and INOUT parameters passed to functions. ! The INOUT, for example, means that the ! parameter will receive a value and return another. PostgreSQL ! only has IN parameters and functions can return ! only a single value. --- 2543,2555 ---- ! Oracle can have ! IN, OUT, and ! INOUT parameters passed to functions. The ! INOUT, for example, means that the ! parameter will receive a value and return ! another. PostgreSQL only has IN ! parameters and functions can return only a single value. *************** *** 2644,2654 **** ! A Procedure with a lot of String Manipulation and OUT Parameters ! The following Oracle PL/SQL procedure is used to parse a URL and return several elements (host, path and query). It is an procedure because in PL/pgSQL functions only one value can be returned (see ). In --- 2680,2690 ---- ! A Procedure with a lot of String Manipulation and <literal>OUT</> Parameters ! The following Oracle PL/SQL procedure is used to parse a URL and return several elements (host, path and query). It is an procedure because in PL/pgSQL functions only one value can be returned (see ). In *************** *** 2738,2744 **** so you can work around it using a combination of other functions. I got tired of doing this and created my own instr functions that behave exactly like ! Oracle's (it makes life easier). See the for the code. --- 2774,2780 ---- so you can work around it using a combination of other functions. I got tired of doing this and created my own instr functions that behave exactly like ! Oracle's (it makes life easier). See the for the code. *************** *** 2750,2758 **** ! Oracle procedures give a little more flexibility to the developer ! because nothing needs to be explicitly returned, but it can be ! through the use of INOUT or OUT parameters. --- 2786,2795 ---- ! Oracle procedures give a little more ! flexibility to the developer because nothing needs to be ! explicitly returned, but it can be through the use of ! INOUT or OUT parameters. *************** *** 2890,2901 **** ! Packages are a way Oracle gives you to encapsulate PL/SQL ! statements and functions into one entity, like Java classes, where ! you define methods and objects. You can access these ! objects/methods with a . ! (dot). Here is an example of an Oracle package from ACS 4 (the ! ArsDigita Community System): --- 2927,2939 ---- ! Packages are a way Oracle gives you to ! encapsulate PL/SQL statements and functions into one entity, like ! Java classes, where you define methods and objects. You can access ! these objects/methods with a . ! (dot). Here is an example of an Oracle ! package from ACS 4 (the ArsDigita Community System): *************** *** 2924,2933 **** ! We port this to PostgreSQL by creating the different objects of ! the Oracle package as functions with a standard naming ! convention. We have to pay attention to some other details, like ! the lack of default parameters in PostgreSQL functions. The above package would become something like this: --- 2962,2972 ---- ! We port this to PostgreSQL by creating the ! different objects of the Oracle package ! as functions with a standard naming convention. We have to pay ! attention to some other details, like the lack of default ! parameters in PostgreSQL functions. The above package would become something like this: Index: doc/src/sgml/xaggr.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/xaggr.sgml,v retrieving revision 1.17 diff -c -r1.17 xaggr.sgml *** doc/src/sgml/xaggr.sgml 21 Sep 2002 18:32:54 -0000 1.17 --- doc/src/sgml/xaggr.sgml 17 Jan 2003 18:35:20 -0000 *************** *** 114,121 **** For further details see the description of the CREATE ! AGGREGATE command in the Reference ! Manual. --- 114,120 ---- For further details see the description of the CREATE ! AGGREGATE command in the &cite-reference;. Index: doc/src/sgml/xfunc.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/xfunc.sgml,v retrieving revision 1.62 diff -c -r1.62 xfunc.sgml *** doc/src/sgml/xfunc.sgml 15 Nov 2002 03:11:17 -0000 1.62 --- doc/src/sgml/xfunc.sgml 17 Jan 2003 18:35:50 -0000 *************** *** 2051,2058 **** it is not immediately clear which function would be called with some trivial input like test(1, 1.5). The currently implemented resolution rules are described in the ! User's Guide, but it is unwise to design a ! system that subtly relies on this behavior. --- 2051,2058 ---- it is not immediately clear which function would be called with some trivial input like test(1, 1.5). The currently implemented resolution rules are described in the ! &cite-user;, but it is unwise to design a system that subtly ! relies on this behavior. Index: doc/src/sgml/ref/alter_database.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/alter_database.sgml,v retrieving revision 1.3 diff -c -r1.3 alter_database.sgml *** doc/src/sgml/ref/alter_database.sgml 17 May 2002 01:19:16 -0000 1.3 --- doc/src/sgml/ref/alter_database.sgml 17 Jan 2003 18:37:44 -0000 *************** *** 71,78 **** See and the ! Administrator's Guide for more ! information about allowed variable names and values. --- 71,78 ---- See and the ! &cite-admin; for more information about allowed variable names ! and values. Index: doc/src/sgml/ref/alter_table.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/alter_table.sgml,v retrieving revision 1.53 diff -c -r1.53 alter_table.sgml *** doc/src/sgml/ref/alter_table.sgml 16 Dec 2002 19:08:25 -0000 1.53 --- doc/src/sgml/ref/alter_table.sgml 17 Jan 2003 18:38:08 -0000 *************** *** 399,407 **** Refer to CREATE TABLE for a further description ! of valid arguments. ! The PostgreSQL User's Guide has further ! information on inheritance. --- 399,406 ---- Refer to CREATE TABLE for a further description ! of valid arguments. The &cite-user; has further information on ! inheritance. Index: doc/src/sgml/ref/alter_user.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/alter_user.sgml,v retrieving revision 1.23 diff -c -r1.23 alter_user.sgml *** doc/src/sgml/ref/alter_user.sgml 21 Sep 2002 18:32:54 -0000 1.23 --- doc/src/sgml/ref/alter_user.sgml 17 Jan 2003 20:57:17 -0000 *************** *** 145,152 **** See and the ! Administrator's Guide for more ! information about allowed variable names and values. --- 145,152 ---- See and the ! &cite-admin; for more information about allowed variable names ! and values. Index: doc/src/sgml/ref/analyze.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/analyze.sgml,v retrieving revision 1.9 diff -c -r1.9 analyze.sgml *** doc/src/sgml/ref/analyze.sgml 31 Jul 2002 17:19:51 -0000 1.9 --- doc/src/sgml/ref/analyze.sgml 17 Jan 2003 18:38:42 -0000 *************** *** 152,159 **** ANALYZE deems them uninteresting (for example, in a unique-key column, there are no common values) or if the column data type does not support the appropriate operators. There is more ! information about the statistics in the User's ! Guide. --- 152,158 ---- ANALYZE deems them uninteresting (for example, in a unique-key column, there are no common values) or if the column data type does not support the appropriate operators. There is more ! information about the statistics in the &cite-user;. Index: doc/src/sgml/ref/begin.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/begin.sgml,v retrieving revision 1.20 diff -c -r1.20 begin.sgml *** doc/src/sgml/ref/begin.sgml 21 Sep 2002 18:32:54 -0000 1.20 --- doc/src/sgml/ref/begin.sgml 17 Jan 2003 20:27:55 -0000 *************** *** 121,128 **** SET TRANSACTION ISOLATION LEVEL SERIALIZABLE just after BEGIN if you need more rigorous transaction isolation. (Alternatively, you can change the default transaction ! isolation level; see the PostgreSQL Administrator's ! Guide for details.) In SERIALIZABLE mode queries will see only changes committed before the entire transaction began (actually, before execution of the first DML statement --- 121,127 ---- SET TRANSACTION ISOLATION LEVEL SERIALIZABLE just after BEGIN if you need more rigorous transaction isolation. (Alternatively, you can change the default transaction ! isolation level; see the &cite-admin; for details.) In SERIALIZABLE mode queries will see only changes committed before the entire transaction began (actually, before execution of the first DML statement *************** *** 161,167 **** ! If you turn autocommit mode off, then BEGIN is not required: any SQL command automatically starts a transaction. --- 160,166 ---- ! If you turn autocommit mode off, then BEGIN is not required: any SQL command automatically starts a transaction. Index: doc/src/sgml/ref/checkpoint.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/checkpoint.sgml,v retrieving revision 1.6 diff -c -r1.6 checkpoint.sgml *** doc/src/sgml/ref/checkpoint.sgml 21 Apr 2002 19:02:39 -0000 1.6 --- doc/src/sgml/ref/checkpoint.sgml 17 Jan 2003 18:41:12 -0000 *************** *** 34,41 **** A checkpoint is a point in the transaction log sequence at which all data files have been updated to reflect the information in the log. All data files will be flushed to disk. Refer to the ! PostgreSQL Administrator's Guide for more ! information about the WAL system. --- 34,40 ---- A checkpoint is a point in the transaction log sequence at which all data files have been updated to reflect the information in the log. All data files will be flushed to disk. Refer to the ! &cite-admin; for more information about the WAL system. *************** *** 48,54 **** See Also ! PostgreSQL Administrator's Guide --- 47,53 ---- See Also ! &cite-admin; *************** *** 61,63 **** --- 60,79 ---- + + Index: doc/src/sgml/ref/create_aggregate.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_aggregate.sgml,v retrieving revision 1.22 diff -c -r1.22 create_aggregate.sgml *** doc/src/sgml/ref/create_aggregate.sgml 21 Oct 2002 04:33:39 -0000 1.22 --- doc/src/sgml/ref/create_aggregate.sgml 17 Jan 2003 18:41:36 -0000 *************** *** 271,279 **** Usage ! Refer to the chapter on aggregate functions ! in the PostgreSQL Programmer's Guide for ! complete examples of usage. --- 271,278 ---- Usage ! Refer to the chapter on aggregate functions in the ! &cite-programmer; for complete examples of usage. Index: doc/src/sgml/ref/create_cast.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_cast.sgml,v retrieving revision 1.7 diff -c -r1.7 create_cast.sgml *** doc/src/sgml/ref/create_cast.sgml 15 Nov 2002 03:11:17 -0000 1.7 --- doc/src/sgml/ref/create_cast.sgml 17 Jan 2003 18:41:55 -0000 *************** *** 241,247 **** , , , ! PostgreSQL Programmer's Guide --- 241,247 ---- , , , ! &cite-programmer; Index: doc/src/sgml/ref/create_conversion.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_conversion.sgml,v retrieving revision 1.5 diff -c -r1.5 create_conversion.sgml *** doc/src/sgml/ref/create_conversion.sgml 2 Nov 2002 02:33:03 -0000 1.5 --- doc/src/sgml/ref/create_conversion.sgml 17 Jan 2003 18:42:26 -0000 *************** *** 158,164 **** , , ! PostgreSQL Programmer's Guide --- 158,164 ---- , , ! &cite-programmer; Index: doc/src/sgml/ref/create_database.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_database.sgml,v retrieving revision 1.30 diff -c -r1.30 create_database.sgml *** doc/src/sgml/ref/create_database.sgml 15 Nov 2002 03:11:17 -0000 1.30 --- doc/src/sgml/ref/create_database.sgml 17 Jan 2003 18:42:50 -0000 *************** *** 281,287 **** by specifying its name as the template, this is not (yet) intended as a general-purpose COPY DATABASE facility. We recommend that databases used as templates be treated as read-only. ! See the Administrator's Guide for more information. --- 281,287 ---- by specifying its name as the template, this is not (yet) intended as a general-purpose COPY DATABASE facility. We recommend that databases used as templates be treated as read-only. ! See the &cite-admin; for more information. Index: doc/src/sgml/ref/create_domain.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_domain.sgml,v retrieving revision 1.9 diff -c -r1.9 create_domain.sgml *** doc/src/sgml/ref/create_domain.sgml 12 Dec 2002 20:35:07 -0000 1.9 --- doc/src/sgml/ref/create_domain.sgml 17 Jan 2003 18:43:28 -0000 *************** *** 58,64 **** The underlying data type of the domain. This may include array specifiers. ! Refer to the User's Guide for further information about data types and arrays. --- 58,64 ---- The underlying data type of the domain. This may include array specifiers. ! Refer to the &cite-user; for further information about data types and arrays. *************** *** 224,230 **** ! PostgreSQL Programmer's Guide --- 224,230 ---- ! &cite-programmer; Index: doc/src/sgml/ref/create_function.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_function.sgml,v retrieving revision 1.43 diff -c -r1.43 create_function.sgml *** doc/src/sgml/ref/create_function.sgml 21 Sep 2002 18:32:54 -0000 1.43 --- doc/src/sgml/ref/create_function.sgml 17 Jan 2003 18:44:12 -0000 *************** *** 281,288 **** Notes ! Refer to the chapter in the ! PostgreSQL Programmer's Guide on the topic of extending PostgreSQL via functions for further information on writing external functions. --- 281,287 ---- Notes ! Refer to the chapter in the &cite-programmer; on the topic of extending PostgreSQL via functions for further information on writing external functions. *************** *** 470,476 **** , , , ! PostgreSQL Programmer's Guide --- 469,475 ---- , , , ! &cite-programmer; Index: doc/src/sgml/ref/create_group.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_group.sgml,v retrieving revision 1.8 diff -c -r1.8 create_group.sgml *** doc/src/sgml/ref/create_group.sgml 21 Apr 2002 19:02:39 -0000 1.8 --- doc/src/sgml/ref/create_group.sgml 17 Jan 2003 18:46:31 -0000 *************** *** 107,116 **** Description ! CREATE GROUP will create a new group in the database installation. ! Refer to the Administrator's Guide for information about using groups ! for authentication. ! You must be a database superuser to use this command. Use --- 107,116 ---- Description ! CREATE GROUP will create a new group in the ! database installation. Refer to the &cite-admin; for information ! about using groups for authentication. You must be a database ! superuser to use this command. Use Index: doc/src/sgml/ref/create_language.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_language.sgml,v retrieving revision 1.29 diff -c -r1.29 create_language.sgml *** doc/src/sgml/ref/create_language.sgml 21 Nov 2002 23:34:43 -0000 1.29 --- doc/src/sgml/ref/create_language.sgml 17 Jan 2003 18:47:03 -0000 *************** *** 37,45 **** CREATE LANGUAGE effectively associates the language name with a call handler that is responsible for executing ! functions written in the language. Refer to the ! Programmer's Guide for more information ! about language call handlers. --- 37,44 ---- CREATE LANGUAGE effectively associates the language name with a call handler that is responsible for executing ! functions written in the language. Refer to the &cite-programmer; ! for more information about language call handlers. *************** *** 301,307 **** ! PostgreSQL Programmer's Guide --- 300,306 ---- ! &cite-programmer; Index: doc/src/sgml/ref/create_opclass.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_opclass.sgml,v retrieving revision 1.4 diff -c -r1.4 create_opclass.sgml *** doc/src/sgml/ref/create_opclass.sgml 4 Oct 2002 22:19:29 -0000 1.4 --- doc/src/sgml/ref/create_opclass.sgml 17 Jan 2003 18:47:36 -0000 *************** *** 224,231 **** Refer to the chapter on interfacing extensions to indexes in the ! PostgreSQL Programmer's Guide ! for further information. --- 224,230 ---- Refer to the chapter on interfacing extensions to indexes in the ! &cite-programmer; for further information. Index: doc/src/sgml/ref/create_operator.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_operator.sgml,v retrieving revision 1.32 diff -c -r1.32 create_operator.sgml *** doc/src/sgml/ref/create_operator.sgml 21 Sep 2002 18:32:54 -0000 1.32 --- doc/src/sgml/ref/create_operator.sgml 17 Jan 2003 18:47:56 -0000 *************** *** 436,443 **** Notes ! Refer to the chapter on operators in the ! PostgreSQL User's Guide for further information. Refer to DROP OPERATOR to delete user-defined operators from a database. --- 436,442 ---- Notes ! Refer to the chapter on operators in the &cite-user; for further information. Refer to DROP OPERATOR to delete user-defined operators from a database. Index: doc/src/sgml/ref/create_sequence.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_sequence.sgml,v retrieving revision 1.29 diff -c -r1.29 create_sequence.sgml *** doc/src/sgml/ref/create_sequence.sgml 10 Nov 2002 00:10:20 -0000 1.29 --- doc/src/sgml/ref/create_sequence.sgml 17 Jan 2003 18:48:11 -0000 *************** *** 256,262 **** currval and setval to operate on the sequence. These functions are documented in ! the User's Guide. --- 256,262 ---- currval and setval to operate on the sequence. These functions are documented in ! the &cite-user;. Index: doc/src/sgml/ref/create_table.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_table.sgml,v retrieving revision 1.60 diff -c -r1.60 create_table.sgml *** doc/src/sgml/ref/create_table.sgml 16 Dec 2002 19:08:25 -0000 1.60 --- doc/src/sgml/ref/create_table.sgml 17 Jan 2003 20:06:21 -0000 *************** *** 147,154 **** The data type of the column. This may include array specifiers. ! Refer to the User's Guide for further ! information about data types and arrays. --- 147,154 ---- The data type of the column. This may include array specifiers. ! Refer to the &cite-user; for further information about data ! types and arrays. Index: doc/src/sgml/ref/create_trigger.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_trigger.sgml,v retrieving revision 1.31 diff -c -r1.31 create_trigger.sgml *** doc/src/sgml/ref/create_trigger.sgml 17 Dec 2002 17:41:30 -0000 1.31 --- doc/src/sgml/ref/create_trigger.sgml 17 Jan 2003 20:07:02 -0000 *************** *** 202,210 **** ! Refer to the chapters on SPI and Triggers in the ! PostgreSQL Programmer's Guide for more ! information. --- 202,209 ---- ! Refer to the chapters on SPI and Triggers in the &cite-programmer; ! for more information. *************** *** 349,355 **** ! PostgreSQL Programmer's Guide --- 348,354 ---- ! &cite-programmer; Index: doc/src/sgml/ref/create_type.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_type.sgml,v retrieving revision 1.37 diff -c -r1.37 create_type.sgml *** doc/src/sgml/ref/create_type.sgml 21 Nov 2002 23:34:43 -0000 1.37 --- doc/src/sgml/ref/create_type.sgml 17 Jan 2003 20:07:18 -0000 *************** *** 468,474 **** ! PostgreSQL Programmer's Guide --- 468,474 ---- ! &cite-programmer; Index: doc/src/sgml/ref/create_user.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/create_user.sgml,v retrieving revision 1.23 diff -c -r1.23 create_user.sgml *** doc/src/sgml/ref/create_user.sgml 27 Feb 2002 21:14:53 -0000 1.23 --- doc/src/sgml/ref/create_user.sgml 17 Jan 2003 20:07:55 -0000 *************** *** 34,43 **** CREATE USER will add a new user to an instance ! of PostgreSQL. Refer to the ! Administrator's Guide for information about ! managing users and authentication. You must be a database ! superuser to use this command. --- 34,42 ---- CREATE USER will add a new user to an instance ! of PostgreSQL. Refer to the &cite-admin; ! for information about managing users and authentication. You must ! be a database superuser to use this command. *************** *** 102,113 **** ! See the chapter on client authentication in the ! Administrator's Guide for details on ! how to set up authentication mechanisms. Note that older ! clients may lack support for the MD5 authentication mechanism ! that is needed to work with passwords that are stored ! encrypted. --- 101,111 ---- ! See the chapter on client authentication in the &cite-admin; ! for details on how to set up authentication mechanisms. Note ! that older clients may lack support for the MD5 authentication ! mechanism that is needed to work with passwords that are ! stored encrypted. Index: doc/src/sgml/ref/drop_aggregate.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/drop_aggregate.sgml,v retrieving revision 1.19 diff -c -r1.19 drop_aggregate.sgml *** doc/src/sgml/ref/drop_aggregate.sgml 12 Jul 2002 18:43:12 -0000 1.19 --- doc/src/sgml/ref/drop_aggregate.sgml 17 Jan 2003 20:08:54 -0000 *************** *** 47,56 **** The input data type of the aggregate function, or * if the function accepts any input type. ! (Refer to the PostgreSQL User's Guide for ! further information about data types.) ! This should become a cross-reference rather than a ! hard-coded chapter number --- 47,53 ---- The input data type of the aggregate function, or * if the function accepts any input type. ! (Refer to the &cite-user; for further information about data types.) Index: doc/src/sgml/ref/ecpg-ref.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/ecpg-ref.sgml,v retrieving revision 1.23 diff -c -r1.23 ecpg-ref.sgml *** doc/src/sgml/ref/ecpg-ref.sgml 15 Nov 2002 03:11:18 -0000 1.23 --- doc/src/sgml/ref/ecpg-ref.sgml 17 Jan 2003 20:10:06 -0000 *************** *** 49,55 **** This reference page does not describe the embedded SQL language. ! See the &cite-programmer; for that. --- 49,55 ---- This reference page does not describe the embedded SQL language. ! See the &cite-programmer; for more information on that topic. *************** *** 196,203 **** See Also ! PostgreSQL Programmer's Guide for a more ! detailed description of the embedded SQL interface --- 196,203 ---- See Also ! &cite-programmer; for a more detailed description of the embedded ! SQL interface Index: doc/src/sgml/ref/execute.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/execute.sgml,v retrieving revision 1.1 diff -c -r1.1 execute.sgml *** doc/src/sgml/ref/execute.sgml 27 Aug 2002 04:55:07 -0000 1.1 --- doc/src/sgml/ref/execute.sgml 17 Jan 2003 20:46:39 -0000 *************** *** 21,27 **** 2002-08-12 ! EXECUTE plan_name [ (parameter [, ...] ) ] --- 21,27 ---- 2002-08-12 ! EXECUTE plan_name [ (parameter [, ...] ) ] [ INTO [ TEMPORARY | TEMP ] table ] *************** *** 42,57 **** parameter ! The actual value of a parameter to the prepared query. ! This must be an expression yielding a value of a type ! compatible with ! the data-type specified for this parameter position in the ! PREPARE statement that created the prepared ! query. --- 42,69 ---- + parameter ! The actual value of a parameter to the prepared query. This ! must be an expression yielding a value of a type compatible ! with the data-type specified for this parameter position in ! the PREPARE statement that created the ! prepared query. ! ! ! ! ! ! table ! ! ! The name of the table in which to store the results of ! executing the query (if it is a SELECT). If ! no table is specified, the results are returned to the client ! (as normal). *************** *** 83,88 **** --- 95,107 ---- error is raised. Note that (unlike functions) prepared queries are not overloaded based on the type or number of their parameters: the name of a prepared query must be unique within a database session. + + + + Like SELECT INTO, EXECUTE can + be used to store the results of executing the query in a table by + specifying an INTO clause. For more information on this behabior, + consult the reference for . Index: doc/src/sgml/ref/explain.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/explain.sgml,v retrieving revision 1.21 diff -c -r1.21 explain.sgml *** doc/src/sgml/ref/explain.sgml 15 Nov 2002 03:11:18 -0000 1.21 --- doc/src/sgml/ref/explain.sgml 17 Jan 2003 20:56:33 -0000 *************** *** 87,95 **** ! Prior to PostgreSQL 7.3, the query plan ! was emitted in the form of a NOTICE message. Now it appears as a ! query result (formatted like a table with a single text column). --- 87,96 ---- ! Prior to PostgreSQL 7.3, the query ! plan was emitted in the form of a NOTICE ! message. Now it appears as a query result (formatted like a ! table with a single text column). *************** *** 127,138 **** costs to estimate which plan is really the cheapest. The ANALYZE option causes the query to be actually executed, not only planned. The total elapsed time expended within each plan node (in milliseconds) and total number of rows it actually returned are added to the display. This is useful for seeing whether the planner's estimates ! are close to reality. --- 128,153 ---- costs to estimate which plan is really the cheapest. + + + In order to allow the PostgreSQL query + planner to make reasonably informed decisions when optimizing + queries, the ANALYZE statement should be used + to record statistics about the distribution of data within the + table. If you have not done this (or the statistical distribution + of the data in the table has changed significantly since the last + time ANALYZE was run), the estimated costs and + the resulting query plan displayed by EXPLAIN + are unlikely to conform to the real properties of the query. + + + The ANALYZE option causes the query to be actually executed, not only planned. The total elapsed time expended within each plan node (in milliseconds) and total number of rows it actually returned are added to the display. This is useful for seeing whether the planner's estimates ! are close to the actual performance of the query. *************** *** 171,178 **** There is only sparse documentation on the optimizer's use of cost information in PostgreSQL. ! Refer to the User's Guide and ! Programmer's Guide for more information. --- 186,192 ---- There is only sparse documentation on the optimizer's use of cost information in PostgreSQL. ! Refer to the &cite-user; and &cite-programmer; for more information. *************** *** 233,239 **** Note that the specific numbers shown, and even the selected query strategy, may vary between PostgreSQL ! releases due to planner improvements. --- 247,258 ---- Note that the specific numbers shown, and even the selected query strategy, may vary between PostgreSQL ! releases due to planner improvements. In addition, the algorithm ! used by ANALYZE to generate statistics is not ! completely deterministic; therefore, it is possible (although not ! likely) for cost estimations to change between runs of ! ANALYZE, even if the actual distribution of data ! in the table has not changed. Index: doc/src/sgml/ref/initdb.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/initdb.sgml,v retrieving revision 1.23 diff -c -r1.23 initdb.sgml *** doc/src/sgml/ref/initdb.sgml 11 Oct 2002 23:03:48 -0000 1.23 --- doc/src/sgml/ref/initdb.sgml 17 Jan 2003 20:10:23 -0000 *************** *** 253,259 **** ! PostgreSQL Administrator's Guide --- 253,259 ---- ! &cite-admin; Index: doc/src/sgml/ref/initlocation.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/initlocation.sgml,v retrieving revision 1.17 diff -c -r1.17 initlocation.sgml *** doc/src/sgml/ref/initlocation.sgml 11 Oct 2002 23:03:48 -0000 1.17 --- doc/src/sgml/ref/initlocation.sgml 17 Jan 2003 20:10:44 -0000 *************** *** 69,75 **** See Also ! PostgreSQL Administrator's Guide --- 69,75 ---- See Also ! &cite-admin; Index: doc/src/sgml/ref/insert.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/insert.sgml,v retrieving revision 1.19 diff -c -r1.19 insert.sgml *** doc/src/sgml/ref/insert.sgml 21 Sep 2002 18:32:54 -0000 1.19 --- doc/src/sgml/ref/insert.sgml 17 Jan 2003 20:11:10 -0000 *************** *** 216,223 **** ! Insert into arrays (refer to the ! PostgreSQL User's Guide for further information about arrays): --- 216,222 ---- ! Insert into arrays (refer to the &cite-user; for further information about arrays): Index: doc/src/sgml/ref/load.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/load.sgml,v retrieving revision 1.14 diff -c -r1.14 load.sgml *** doc/src/sgml/ref/load.sgml 21 Nov 2002 23:34:43 -0000 1.14 --- doc/src/sgml/ref/load.sgml 17 Jan 2003 20:12:12 -0000 *************** *** 37,44 **** The file name is specified in the same way as for shared library names in ; in particular, one may rely on a search path and automatic addition of the system's standard ! shared library file name extension. See the ! Programmer's Guide for more detail. --- 37,44 ---- The file name is specified in the same way as for shared library names in ; in particular, one may rely on a search path and automatic addition of the system's standard ! shared library file name extension. See the &cite-programmer; for ! more information on this topic. *************** *** 57,63 **** , ! PostgreSQL Programmer's Guide --- 57,63 ---- , ! &cite-programmer; Index: doc/src/sgml/ref/pg_config-ref.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/pg_config-ref.sgml,v retrieving revision 1.12 diff -c -r1.12 pg_config-ref.sgml *** doc/src/sgml/ref/pg_config-ref.sgml 15 Nov 2002 03:11:18 -0000 1.12 --- doc/src/sgml/ref/pg_config-ref.sgml 17 Jan 2003 20:12:45 -0000 *************** *** 160,166 **** See Also ! PostgreSQL Programmer's Guide --- 160,183 ---- See Also ! &cite-programmer; + + Index: doc/src/sgml/ref/pg_ctl-ref.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/pg_ctl-ref.sgml,v retrieving revision 1.17 diff -c -r1.17 pg_ctl-ref.sgml *** doc/src/sgml/ref/pg_ctl-ref.sgml 11 Oct 2002 23:03:48 -0000 1.17 --- doc/src/sgml/ref/pg_ctl-ref.sgml 17 Jan 2003 20:13:36 -0000 *************** *** 368,374 **** See Also ! , PostgreSQL Administrator's Guide --- 368,374 ---- See Also ! , &cite-admin; Index: doc/src/sgml/ref/pg_dump.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/pg_dump.sgml,v retrieving revision 1.54 diff -c -r1.54 pg_dump.sgml *** doc/src/sgml/ref/pg_dump.sgml 6 Jan 2003 18:53:24 -0000 1.54 --- doc/src/sgml/ref/pg_dump.sgml 17 Jan 2003 20:14:03 -0000 *************** *** 705,711 **** ! PostgreSQL Administrator's Guide --- 705,711 ---- ! &cite-admin; Index: doc/src/sgml/ref/pg_restore.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/pg_restore.sgml,v retrieving revision 1.34 diff -c -r1.34 pg_restore.sgml *** doc/src/sgml/ref/pg_restore.sgml 6 Jan 2003 18:53:24 -0000 1.34 --- doc/src/sgml/ref/pg_restore.sgml 17 Jan 2003 20:14:17 -0000 *************** *** 697,703 **** ! PostgreSQL Administrator's Guide --- 697,703 ---- ! &cite-admin; Index: doc/src/sgml/ref/pgtclsh.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/pgtclsh.sgml,v retrieving revision 1.5 diff -c -r1.5 pgtclsh.sgml *** doc/src/sgml/ref/pgtclsh.sgml 21 Apr 2002 19:02:39 -0000 1.5 --- doc/src/sgml/ref/pgtclsh.sgml 17 Jan 2003 20:14:56 -0000 *************** *** 55,61 **** ! PostgreSQL Programmer's Guide (description of libpgtcl) tclsh 1 --- 55,61 ---- ! &cite-programmer; (description of libpgtcl) tclsh 1 Index: doc/src/sgml/ref/pgtksh.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/pgtksh.sgml,v retrieving revision 1.5 diff -c -r1.5 pgtksh.sgml *** doc/src/sgml/ref/pgtksh.sgml 21 Apr 2002 19:02:39 -0000 1.5 --- doc/src/sgml/ref/pgtksh.sgml 17 Jan 2003 20:15:18 -0000 *************** *** 55,61 **** ! PostgreSQL Programmer's Guide (description of libpgtcl) tclsh 1 --- 55,61 ---- ! &cite-programmer; (description of libpgtcl) tclsh 1 Index: doc/src/sgml/ref/postgres-ref.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/postgres-ref.sgml,v retrieving revision 1.29 diff -c -r1.29 postgres-ref.sgml *** doc/src/sgml/ref/postgres-ref.sgml 23 Oct 2002 23:33:08 -0000 1.29 --- doc/src/sgml/ref/postgres-ref.sgml 17 Jan 2003 20:16:00 -0000 *************** *** 123,133 **** You can avoid having to type these options by setting up a ! configuration file. See the Administrator's ! Guide for details. Some (safe) options can also be ! set from the connecting client in an application-dependent way. ! For example, if the environment variable PGOPTIONS ! is set, then libpq-based clients will pass that string to the server, which will interpret it as postgres command-line options. --- 123,133 ---- You can avoid having to type these options by setting up a ! configuration file. See the &cite-admin; for details. Some ! (safe) options can also be set from the connecting client in an ! application-dependent way. For example, if the environment ! variable PGOPTIONS is set, then ! libpq-based clients will pass that string to the server, which will interpret it as postgres command-line options. *************** *** 153,160 **** means that the day before month (rather than month before day) rule is used to interpret ambiguous date input, and that the day is printed before the month in certain ! date output formats. See the PostgreSQL User's ! Guide for more information. --- 153,159 ---- means that the day before month (rather than month before day) rule is used to interpret ambiguous date input, and that the day is printed before the month in certain ! date output formats. See the &cite-user; for more information. Index: doc/src/sgml/ref/postmaster.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/postmaster.sgml,v retrieving revision 1.33 diff -c -r1.33 postmaster.sgml *** doc/src/sgml/ref/postmaster.sgml 11 Oct 2002 23:03:48 -0000 1.33 --- doc/src/sgml/ref/postmaster.sgml 17 Jan 2003 20:17:21 -0000 *************** *** 80,88 **** postmaster accepts the following command line arguments. For a detailed discussion of the options ! consult the Administrator's Guide. You can ! also save typing most of these options by setting up a ! configuration file. --- 80,87 ---- postmaster accepts the following command line arguments. For a detailed discussion of the options ! consult the &cite-admin;. You can also save typing most of these ! options by setting up a configuration file. *************** *** 111,121 **** -c name=value ! Sets a named run-time parameter. Consult the ! Administrator's Guide for a list and ! descriptions. Most of the other command line options are in ! fact short forms of such a parameter assignment. --- 110,120 ---- -c name=value ! Sets a named run-time parameter. Consult the &cite-admin; for ! a list and descriptions. Most of the other command line ! options are in fact short forms of such a parameter ! assignment. *************** *** 219,227 **** default, this value is 32, but it can be set as high as your system will support. (Note that is required to be at least twice ! . See the Administrator's ! Guide for a discussion of system resource requirements ! for large numbers of client connections.) --- 218,226 ---- default, this value is 32, but it can be set as high as your system will support. (Note that is required to be at least twice ! . See the &cite-admin; for a discussion of ! system resource requirements for large numbers of client ! connections.) *************** *** 404,411 **** Other environment variables may be used to designate alternative ! data storage locations. See the Administrator's ! Guide for more information. --- 403,410 ---- Other environment variables may be used to designate alternative ! data storage locations. See the &cite-admin; for more ! information. Index: doc/src/sgml/ref/reset.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/reset.sgml,v retrieving revision 1.17 diff -c -r1.17 reset.sgml *** doc/src/sgml/ref/reset.sgml 13 Oct 2002 16:55:05 -0000 1.17 --- doc/src/sgml/ref/reset.sgml 17 Jan 2003 20:17:40 -0000 *************** *** 64,70 **** current session. The actual source of this value might be a compiled-in default, the postmaster's configuration file or command-line switches, or per-database or per-user default settings. See the ! Administrator's Guide for details. --- 64,70 ---- current session. The actual source of this value might be a compiled-in default, the postmaster's configuration file or command-line switches, or per-database or per-user default settings. See the ! &cite-admin; for details. Index: doc/src/sgml/ref/select.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/select.sgml,v retrieving revision 1.63 diff -c -r1.63 select.sgml *** doc/src/sgml/ref/select.sgml 24 Oct 2002 21:19:15 -0000 1.63 --- doc/src/sgml/ref/select.sgml 17 Jan 2003 20:24:20 -0000 *************** *** 291,309 **** ! DISTINCT will eliminate duplicate rows from the ! result. ! ALL (the default) will return all candidate rows, ! including duplicates. ! DISTINCT ON eliminates rows that match on all the specified expressions, keeping only the first row of each set of duplicates. The DISTINCT ON expressions are interpreted using the same rules as for ORDER BY items; see below. Note that the first row of each set is unpredictable ! unless ORDER BY is used to ensure that the desired row appears first. For example, SELECT DISTINCT ON (location) location, time, report --- 291,307 ---- ! DISTINCT will eliminate duplicate rows from the result. ALL (the ! default) will return all candidate rows, including duplicates. ! DISTINCT ON eliminates rows that match on all the specified expressions, keeping only the first row of each set of duplicates. The DISTINCT ON expressions are interpreted using the same rules as for ORDER BY items; see below. Note that the first row of each set is unpredictable ! unless ORDER BY is used to ensure that the desired row appears first. For example, SELECT DISTINCT ON (location) location, time, report *************** *** 336,344 **** ! SELECT queries can be combined using UNION, INTERSECT, and EXCEPT ! operators. Use parentheses if necessary to determine the ordering ! of these operators. --- 334,342 ---- ! SELECT queries can be combined using UNION, ! INTERSECT, and EXCEPT operators. Use parentheses if necessary to ! determine the ordering of these operators. *************** *** 368,375 **** ! The FOR UPDATE clause causes the SELECT statement to lock the selected ! rows against concurrent updates. --- 366,373 ---- ! The FOR UPDATE clause causes the SELECT ! statement to lock the selected rows against concurrent updates. *************** *** 387,397 **** ! The FROM clause specifies one or more source tables for the SELECT. ! If multiple sources are specified, the result is conceptually the ! Cartesian product of all the rows in all the sources --- but usually ! qualification conditions are added to restrict the returned rows to ! a small subset of the Cartesian product. --- 385,396 ---- ! The FROM clause specifies one or more source tables for the ! SELECT. If multiple sources are specified, the ! result is conceptually the Cartesian product of all the rows in ! all the sources --- but usually qualification conditions are added ! to restrict the returned rows to a small subset of the Cartesian ! product. *************** *** 407,416 **** ! A FROM item can also be a parenthesized sub-SELECT (note that an ! alias clause is required for a sub-SELECT!). This is an extremely ! handy feature since it's the only way to get multiple levels of ! grouping, aggregation, or sorting in a single query. --- 406,416 ---- ! A FROM item can also be a parenthesized ! sub-SELECT (note that an alias clause is ! required for a sub-SELECT!). This is an ! extremely useful feature since it's the only way to get multiple ! levels of grouping, aggregation, or sorting in a single query. *************** *** 542,564 **** ! GROUP BY will condense into a single row all selected rows that share the ! same values for the grouped columns. Aggregate functions, if any, ! are computed across all rows making up each group, producing a ! separate value for each group (whereas without GROUP BY, an ! aggregate produces a single value computed across all the selected ! rows). When GROUP BY is present, it is not valid for the SELECT ! output expression(s) to refer to ungrouped columns except within aggregate functions, since there ! would be more than one possible value to return for an ungrouped column. ! A GROUP BY item can be an input column name, or the name or ordinal ! number of an output column (SELECT expression), or it can be an arbitrary ! expression formed from input-column values. In case of ambiguity, a GROUP ! BY name will ! be interpreted as an input-column name rather than an output column name. --- 542,566 ---- ! GROUP BY will condense into a single row all selected rows that ! share the same values for the grouped columns. Aggregate ! functions, if any, are computed across all rows making up each ! group, producing a separate value for each group (whereas without ! GROUP BY, an aggregate produces a single value computed across all ! the selected rows). When GROUP BY is present, it is not valid for ! the SELECT output expression(s) to refer to ungrouped columns except within aggregate functions, since there ! would be more than one possible value to return for an ungrouped ! column. ! A GROUP BY item can be an input column name, or the name or ! ordinal number of an output column (SELECT ! expression), or it can be an arbitrary expression formed from ! input-column values. In case of ambiguity, a GROUP BY name will ! be interpreted as an input-column name rather than an output ! column name. *************** *** 610,619 **** ! An ORDER BY item can be the name or ordinal ! number of an output column (SELECT expression), or it can be an arbitrary ! expression formed from input-column values. In case of ambiguity, an ! ORDER BY name will be interpreted as an output-column name. The ordinal number refers to the ordinal (left-to-right) position --- 612,622 ---- ! An ORDER BY item can be the name or ordinal number of an output ! column (SELECT expression), or it can be an ! arbitrary expression formed from input-column values. In case of ! ambiguity, an ORDER BY name will be interpreted as an ! output-column name. The ordinal number refers to the ordinal (left-to-right) position *************** *** 697,706 **** The UNION operator computes the collection (set union) of the rows ! returned by the queries involved. ! The two SELECT statements that represent the direct operands of the UNION must ! produce the same number of columns, and corresponding columns must be ! of compatible data types. --- 700,709 ---- The UNION operator computes the collection (set union) of the rows ! returned by the queries involved. The two ! SELECT statements that represent the direct ! operands of the UNION must produce the same number of columns, and ! corresponding columns must be of compatible data types. *************** *** 710,717 **** ! Multiple UNION operators in the same SELECT statement are ! evaluated left to right, unless otherwise indicated by parentheses. --- 713,721 ---- ! Multiple UNION operators in the same SELECT ! statement are evaluated left to right, unless otherwise indicated ! by parentheses. *************** *** 864,885 **** ! FOR UPDATE causes the rows retrieved by the query to be locked as though ! for update. This prevents them from being modified or deleted by other ! transactions until the current transaction ends; that is, other ! transactions that attempt UPDATE, DELETE, or SELECT FOR UPDATE of these ! rows will be blocked until the current transaction ends. Also, if an ! UPDATE, DELETE, or SELECT FOR UPDATE from another transaction has already ! locked a selected row or rows, SELECT FOR UPDATE will wait for the other ! transaction to complete, and will then lock and return the updated row ! (or no row, if the row was deleted). For further discussion see the ! concurrency chapter of the User's Guide. ! If specific tables are named in FOR UPDATE, then only rows coming from ! those tables are locked; any other tables used in the SELECT are simply ! read as usual. --- 868,893 ---- ! FOR UPDATE causes the rows retrieved by the query to be locked as ! though for update. This prevents them from being modified or ! deleted by other transactions until the current transaction ends; ! that is, other transactions that attempt ! UPDATE, DELETE, or ! SELECT FOR UPDATE of these rows will be blocked ! until the current transaction ends. Also, if an ! UPDATE, DELETE, or ! SELECT FOR UPDATE from another transaction has ! already locked a selected row or rows, SELECT FOR ! UPDATE will wait for the other transaction to complete, ! and will then lock and return the updated row (or no row, if the ! row was deleted). For further discussion see the concurrency ! chapter of the &cite-user;. ! If specific tables are named in FOR UPDATE, then only rows coming ! from those tables are locked; any other tables used in the ! SELECT are simply read as usual. *************** *** 1097,1105 **** 4 ! Some other SQL databases cannot do this except by introducing a dummy one-row ! table to do the select from. A less obvious use is to abbreviate a ! normal select from one or more tables: SELECT distributors.* WHERE distributors.name = 'Westward'; --- 1105,1113 ---- 4 ! Some other SQL databases cannot do this except by ! introducing a dummy one-row table to do the select from. A less ! obvious use is to abbreviate a normal select from one or more tables: SELECT distributors.* WHERE distributors.name = 'Westward'; Index: doc/src/sgml/ref/set.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/set.sgml,v retrieving revision 1.71 diff -c -r1.71 set.sgml *** doc/src/sgml/ref/set.sgml 12 Jan 2003 01:33:00 -0000 1.71 --- doc/src/sgml/ref/set.sgml 17 Jan 2003 20:25:21 -0000 *************** *** 80,90 **** The SET command changes run-time configuration parameters. Many of the run-time parameters listed in the ! Administrator's Guide can be changed on-the-fly ! with SET. (But some require superuser privileges ! to change, and others cannot be changed after server or session start.) ! Note that SET only affects the value used by the ! current session. --- 80,90 ---- The SET command changes run-time configuration parameters. Many of the run-time parameters listed in the ! &cite-admin; can be changed on-the-fly with SET. ! (But some require superuser privileges to change, and others cannot ! be changed after server or session start.) Note that ! SET only affects the value used by the current ! session. *************** *** 109,118 **** ! Even with autocommit set to off, SET does not start a new transaction block. See the ! autocommit section of the Administrator's ! Guide for details. --- 109,117 ---- ! Even with autocommit set to off, SET does not start a new transaction block. See the ! autocommit section of the &cite-admin; for details. *************** *** 517,524 **** The function set_config provides the equivalent ! capability. See Miscellaneous Functions in the ! PostgreSQL User's Guide. --- 516,523 ---- The function set_config provides the equivalent ! capability. See Miscellaneous Functions in ! the &cite-user;. Index: doc/src/sgml/ref/set_transaction.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/set_transaction.sgml,v retrieving revision 1.11 diff -c -r1.11 set_transaction.sgml *** doc/src/sgml/ref/set_transaction.sgml 11 Jan 2003 00:00:03 -0000 1.11 --- doc/src/sgml/ref/set_transaction.sgml 17 Jan 2003 20:28:58 -0000 *************** *** 109,117 **** SET default_transaction_isolation = 'value' ! and in the ! configuration file. Consult the Administrator's ! Guide for more information. --- 109,116 ---- SET default_transaction_isolation = 'value' ! and in the configuration file. Consult the &cite-admin; for more ! information. *************** *** 127,134 **** not provide the isolation levels and . Because of multiversion concurrency control, the level is not ! truly serializable. See the User's Guide for ! details. --- 126,132 ---- not provide the isolation levels and . Because of multiversion concurrency control, the level is not ! truly serializable. See the &cite-user; for details. Index: doc/src/sgml/ref/show.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/show.sgml,v retrieving revision 1.22 diff -c -r1.22 show.sgml *** doc/src/sgml/ref/show.sgml 13 Oct 2002 16:55:05 -0000 1.22 --- doc/src/sgml/ref/show.sgml 17 Jan 2003 20:30:08 -0000 *************** *** 62,71 **** ! Even with autocommit set to off, SHOW does not start a new transaction block. See the ! autocommit section of the Administrator's ! Guide for details. --- 62,70 ---- ! Even with autocommit set to off, SHOW does not start a new transaction block. See the ! autocommit section of the &cite-admin; for details. *************** *** 91,97 **** Examples ! Show the current DateStyle setting: SHOW DateStyle; --- 90,96 ---- Examples ! Show the current DateStyle setting: SHOW DateStyle; *************** *** 103,109 **** ! Show the current genetic optimizer (geqo) setting: SHOW GEQO; geqo --- 102,109 ---- ! Show whether the genetic query optimizer is enabled by displaying ! the geqo setting: SHOW GEQO; geqo *************** *** 148,154 **** The function current_setting produces equivalent output. See Miscellaneous Functions in the ! PostgreSQL User's Guide. --- 148,154 ---- The function current_setting produces equivalent output. See Miscellaneous Functions in the ! &cite-user;. Index: doc/src/sgml/ref/vacuum.sgml =================================================================== RCS file: /var/lib/cvs/pgsql-server/doc/src/sgml/ref/vacuum.sgml,v retrieving revision 1.27 diff -c -r1.27 vacuum.sgml *** doc/src/sgml/ref/vacuum.sgml 9 Oct 2002 16:27:48 -0000 1.27 --- doc/src/sgml/ref/vacuum.sgml 17 Jan 2003 17:55:34 -0000 *************** *** 206,212 **** intended usage is in connection with preparation of user-defined template databases, or other databases that are completely read-only and will not receive routine maintenance VACUUM operations. ! See the Administrator's Guide for details. --- 206,212 ---- intended usage is in connection with preparation of user-defined template databases, or other databases that are completely read-only and will not receive routine maintenance VACUUM operations. ! See the &cite-admin; for details.