mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-09 08:10:09 +08:00
More < and > changes to ampersands.
8.0.X and HEAD.
This commit is contained in:
parent
1ced129aa3
commit
754b5e1c42
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.90 2005/01/05 18:03:19 momjian Exp $
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.91 2005/01/22 23:22:17 momjian Exp $
|
||||
PostgreSQL documentation
|
||||
-->
|
||||
|
||||
@ -732,7 +732,7 @@ CREATE TABLE films (
|
||||
|
||||
<programlisting>
|
||||
CREATE TABLE distributors (
|
||||
did integer CHECK (did > 100),
|
||||
did integer CHECK (did > 100),
|
||||
name varchar(40)
|
||||
);
|
||||
</programlisting>
|
||||
@ -745,7 +745,7 @@ CREATE TABLE distributors (
|
||||
CREATE TABLE distributors (
|
||||
did integer,
|
||||
name varchar(40)
|
||||
CONSTRAINT con1 CHECK (did > 100 AND name <> '')
|
||||
CONSTRAINT con1 CHECK (did > 100 AND name <> '')
|
||||
);
|
||||
</programlisting>
|
||||
</para>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.44 2004/11/05 19:15:51 tgl Exp $
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.45 2005/01/22 23:22:18 momjian Exp $
|
||||
PostgreSQL documentation
|
||||
-->
|
||||
|
||||
@ -308,7 +308,7 @@ GRANT { CREATE | ALL [ PRIVILEGES ] }
|
||||
Use <xref linkend="app-psql">'s <command>\z</command> command
|
||||
to obtain information about existing privileges, for example:
|
||||
<programlisting>
|
||||
=> \z mytable
|
||||
=> \z mytable
|
||||
|
||||
Access privileges for database "lusitania"
|
||||
Schema | Name | Type | Access privileges
|
||||
|
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.45 2005/01/04 00:39:53 tgl Exp $
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.46 2005/01/22 23:22:19 momjian Exp $
|
||||
PostgreSQL documentation
|
||||
-->
|
||||
|
||||
@ -210,8 +210,8 @@ COMMIT WORK;
|
||||
BEGIN WORK;
|
||||
LOCK TABLE films IN SHARE ROW EXCLUSIVE MODE;
|
||||
DELETE FROM films_user_comments WHERE id IN
|
||||
(SELECT id FROM films WHERE rating < 5);
|
||||
DELETE FROM films WHERE rating < 5;
|
||||
(SELECT id FROM films WHERE rating < 5);
|
||||
DELETE FROM films WHERE rating < 5;
|
||||
COMMIT WORK;
|
||||
</programlisting>
|
||||
</para>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.131 2005/01/22 22:31:52 momjian Exp $
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.132 2005/01/22 23:22:19 momjian Exp $
|
||||
PostgreSQL documentation
|
||||
-->
|
||||
|
||||
@ -2179,11 +2179,11 @@ testdb=> <userinput>INSERT INTO my_table VALUES (:content);</userinput>
|
||||
they don't cause a syntax error when the second line is processed. This
|
||||
could be done with the program <command>sed</command>:
|
||||
<programlisting>
|
||||
testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\''</userinput>
|
||||
testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\''</userinput>
|
||||
</programlisting>
|
||||
Observe the correct number of backslashes (6)! It works
|
||||
this way: After <application>psql</application> has parsed this
|
||||
line, it passes <literal>sed -e "s/'/\\\'/g" < my_file.txt</literal>
|
||||
line, it passes <literal>sed -e "s/'/\\\'/g" < my_file.txt</literal>
|
||||
to the shell. The shell will do its own thing inside the double
|
||||
quotes and execute <command>sed</command> with the arguments
|
||||
<literal>-e</literal> and <literal>s/'/\\'/g</literal>. When
|
||||
@ -2243,8 +2243,8 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt`
|
||||
The full host name (with domain name) of the database server,
|
||||
or <literal>[local]</literal> if the connection is over a Unix
|
||||
domain socket, or
|
||||
<literal>[local:<replaceable>/dir/name</replaceable>]</literal
|
||||
>, if the Unix domain socket is not at the compiled in default
|
||||
<literal>[local:<replaceable>/dir/name</replaceable>]</literal>,
|
||||
if the Unix domain socket is not at the compiled in default
|
||||
location.
|
||||
</para>
|
||||
</listitem>
|
||||
@ -2632,8 +2632,8 @@ Field separator is "oo".
|
||||
input. Notice the changing prompt:
|
||||
<programlisting>
|
||||
testdb=> <userinput>CREATE TABLE my_table (</userinput>
|
||||
testdb(> <userinput> first integer not null default 0,</userinput>
|
||||
testdb(> <userinput> second text)</userinput>
|
||||
testdb(> <userinput> first integer not null default 0,</userinput>
|
||||
testdb(> <userinput> second text)</userinput>
|
||||
testdb-> <userinput>;</userinput>
|
||||
CREATE TABLE
|
||||
</programlisting>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.25 2004/11/04 19:08:08 tgl Exp $
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.26 2005/01/22 23:22:19 momjian Exp $
|
||||
PostgreSQL documentation
|
||||
-->
|
||||
|
||||
@ -234,8 +234,8 @@ REINDEX INDEX my_index;
|
||||
$ <userinput>export PGOPTIONS="-P"</userinput>
|
||||
$ <userinput>psql broken_db</userinput>
|
||||
...
|
||||
broken_db=> REINDEX DATABASE broken_db;
|
||||
broken_db=> \q
|
||||
broken_db=> REINDEX DATABASE broken_db;
|
||||
broken_db=> \q
|
||||
</programlisting>
|
||||
</para>
|
||||
</refsect1>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.80 2005/01/04 08:59:45 tgl Exp $
|
||||
$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.81 2005/01/22 23:22:19 momjian Exp $
|
||||
PostgreSQL documentation
|
||||
-->
|
||||
|
||||
@ -874,7 +874,7 @@ SELECT kind, sum(len) AS total FROM films GROUP BY kind;
|
||||
SELECT kind, sum(len) AS total
|
||||
FROM films
|
||||
GROUP BY kind
|
||||
HAVING sum(len) < interval '5 hours';
|
||||
HAVING sum(len) < interval '5 hours';
|
||||
|
||||
kind | total
|
||||
----------+-------
|
||||
|
Loading…
Reference in New Issue
Block a user