Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf565cf4

Browse files
committed
another set of cleanups
1 parent80c5fea commitf565cf4

30 files changed

+588
-370
lines changed

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.20 2000/01/14 22:18:01 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.21 2000/01/18 23:30:19 petere Exp $
33
Postgres documentation
44
-->
55

@@ -851,6 +851,16 @@ lo_import 152801
851851
</listitem>
852852
</varlistentry>
853853

854+
<varlistentry>
855+
<term><literal>recordsep</literal></term>
856+
<listitem>
857+
<para>
858+
Specifies the record (line) separator to use in unaligned output mode. The default
859+
is a newline character.
860+
</para>
861+
</listitem>
862+
</varlistentry>
863+
854864
<varlistentry>
855865
<term><literal>tuples_only</literal> (or <literal>t</literal>)</term>
856866
<listitem>
@@ -1900,12 +1910,14 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp
19001910
<variablelist>
19011911
<varlistentry>
19021912
<term><literal>%M</literal></term>
1903-
<listitem><para>The hostname of the database server (or <quote>.</quote> if Unix domain socket).</para></listitem>
1913+
<listitem><para>The hostname of the database server (or <quote>.</quote>
1914+
if Unix domain socket).</para></listitem>
19041915
</varlistentry>
19051916

19061917
<varlistentry>
19071918
<term><literal>%m</literal></term>
1908-
<listitem><para>The hostname of the database server truncated after the first dot.</para></listitem>
1919+
<listitem><para>The hostname of the database server truncated after the
1920+
first dot.</para></listitem>
19091921
</varlistentry>
19101922

19111923
<varlistentry>
@@ -1915,7 +1927,8 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp
19151927

19161928
<varlistentry>
19171929
<term><literal>%n</literal></term>
1918-
<listitem><para>The username you are connected as (not your local system user name).</para></listitem>
1930+
<listitem><para>The username you are connected as (not your local system
1931+
user name).</para></listitem>
19191932
</varlistentry>
19201933

19211934
<varlistentry>
@@ -1925,37 +1938,39 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp
19251938

19261939
<varlistentry>
19271940
<term><literal>%~</literal></term>
1928-
<listitem><para>Like <literal>%/</literal>, but the output is <quote>~</quote> (tilde) if the database
1929-
is your default database.</para></listitem>
1941+
<listitem><para>Like <literal>%/</literal>, but the output is <quote>~</quote>
1942+
(tilde) if the databaseis your default database.</para></listitem>
19301943
</varlistentry>
19311944

19321945
<varlistentry>
19331946
<term><literal>%#</literal></term>
1934-
<listitem><para>If the username is <literal>postgres</literal>, a <quote>#</quote>, otherwise a <quote>&gt;</quote>.</para></listitem>
1947+
<listitem><para>If the username is <literal>postgres</literal>, a
1948+
<quote>#</quote>, otherwise a <quote>&gt;</quote>.</para></listitem>
19351949
</varlistentry>
19361950

19371951
<varlistentry>
19381952
<term><literal>%R</literal></term>
19391953
<listitem><para>
1940-
In prompt 1 normally <quote>=</quote>, but <quote>^</quote> if in single-line mode, and
1941-
<quote>!</quote> if the session is disconnected from the database (which can only
1942-
happen if <command>\connect</command> fails).
1943-
In prompt 2 the sequence is replaced by <quote>-</quote>, <quote>*</quote>, a single quote,
1944-
or a double quote, depending on whether <application>psql</application> expects more input
1945-
because the query wasn't terminated yet, because you are inside a <literal>/* ... */</literal>
1946-
comment, or because you are inside a quote.
1947-
In prompt 3 the sequence doesn't resolve to anything.</para>
1954+
In prompt 1 normally <quote>=</quote>, but <quote>^</quote> if in single-line
1955+
mode, and<quote>!</quote> if the session is disconnected from the database
1956+
(which canhappen if <command>\connect</command> fails). In prompt 2 the
1957+
sequence is replaced by <quote>-</quote>, <quote>*</quote>, a single quote,
1958+
or a double quote, depending on whether <application>psql</application>
1959+
expects more inputbecause the query wasn't terminated yet, because you are
1960+
inside a <literal>/* ... */</literal>comment, or because you are inside
1961+
a quote.In prompt 3 the sequence doesn't resolve to anything.</para>
19481962
</listitem>
19491963
</varlistentry>
19501964

19511965
<varlistentry>
19521966
<term><literal>%</literal><replaceable class="parameter">digits</replaceable></term>
19531967
<listitem><para>
1954-
If <replaceable class="parameter">digits</replaceable> starts with <literal>0x</literal>
1955-
the rest of the characters are interpreted at a hexadecimal digit and the
1956-
character with the corresponding code is subsituted. If the first digit is <literal>0</literal>
1957-
the characters are interpreted as on octal number and the corresponding character
1958-
is substituted. Otherwise a decimal number is assumed.</para>
1968+
If <replaceable class="parameter">digits</replaceable> starts with
1969+
<literal>0x</literal> the rest of the characters are interpreted at a
1970+
hexadecimal digit and the character with the corresponding code is
1971+
subsituted. If the first digit is <literal>0</literal> the characters are
1972+
interpreted as on octal number and the corresponding character is
1973+
substituted. Otherwise a decimal number is assumed.</para>
19591974
</listitem>
19601975
</varlistentry>
19611976

‎src/backend/parser/gram.y

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.130 2000/01/1819:08:13 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.131 2000/01/1823:30:20 petere Exp $
1414
*
1515
* HISTORY
1616
* AUTHORDATEMAJOR EVENT
@@ -854,6 +854,7 @@ AlterTableStmt:
854854
|ALTERTABLErelation_nameopt_inh_starDROPCONSTRAINTnamedrop_behavior
855855
{
856856
AlterTableStmt *n = makeNode(AlterTableStmt);
857+
n->subtype ='X';
857858
n->relname =$3;
858859
n->inh =$4;
859860
n->name =$7;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp