Skip to content

Commit bf86bac

Browse files
peterepetere
committed
Change standard_compliant_strings to standard_conforming_strings.
1 parent 8ae0d47 commit bf86bac

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎doc/src/sgml/libpq.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.188 2005/06/27 02:04:24 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.189 2005/08/14 22:19:49 petere Exp $
33
-->
44

55
<chapter id="libpq">
@@ -890,10 +890,10 @@ Parameters reported as of the current release include
890890
<literal>DateStyle</>,
891891
<literal>TimeZone</>,
892892
<literal>integer_datetimes</>, and
893-
<literal>standard_compliant_strings</>.
893+
<literal>standard_conforming_strings</>.
894894
(<literal>server_encoding</>, <literal>TimeZone</>, and
895895
<literal>integer_datetimes</> were not reported by releases before 8.0;
896-
<literal>standard_compliant_strings</> was not reported by releases
896+
<literal>standard_conforming_strings</> was not reported by releases
897897
before 8.1.)
898898
Note that
899899
<literal>server_version</>,
@@ -917,7 +917,7 @@ in a numeric form that is much easier to compare against.
917917
</para>
918918

919919
<para>
920-
If no value for <literal>standard_compliant_strings</> is reported,
920+
If no value for <literal>standard_conforming_strings</> is reported,
921921
applications may assume it is <literal>false</>, that is, backslashes
922922
are treated as escapes in string literals. Also, the presence of this
923923
parameter may be taken as an indication that the escape string syntax

‎doc/src/sgml/protocol.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/protocol.sgml,v 1.61 2005/06/27 02:04:24 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/protocol.sgml,v 1.62 2005/08/14 22:19:49 petere Exp $ -->
22

33
<chapter id="protocol">
44
<title>Frontend/Backend Protocol</title>
@@ -1061,10 +1061,10 @@
10611061
<literal>DateStyle</>,
10621062
<literal>TimeZone</>,
10631063
<literal>integer_datetimes</>, and
1064-
<literal>standard_compliant_strings</>.
1064+
<literal>standard_conforming_strings</>.
10651065
(<literal>server_encoding</>, <literal>TimeZone</>, and
10661066
<literal>integer_datetimes</> were not reported by releases before 8.0;
1067-
<literal>standard_compliant_strings</> was not reported by releases
1067+
<literal>standard_conforming_strings</> was not reported by releases
10681068
before 8.1.)
10691069
Note that
10701070
<literal>server_version</>,

‎doc/src/sgml/runtime.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.344 2005/08/11 21:11:42 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.345 2005/08/14 22:19:49 petere Exp $
33
-->
44

55
<chapter Id="runtime">
@@ -4089,7 +4089,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
40894089
Escape string syntax (<literal>E'...'</>) should be used for
40904090
escapes, because in future versions of
40914091
<productname>PostgreSQL</productname> ordinary strings will have
4092-
the standard-compliant behavior of treating backslashes
4092+
the standard-conforming behavior of treating backslashes
40934093
literally.
40944094
</para>
40954095
</listitem>
@@ -4303,11 +4303,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
43034303
</listitem>
43044304
</varlistentry>
43054305

4306-
<varlistentry id="guc-standard-compliant-strings" xreflabel="standard_compliant_strings">
4307-
<term><varname>standard_compliant_strings</varname> (<type>boolean</type>)</term>
4306+
<varlistentry id="guc-standard-conforming-strings" xreflabel="standard_conforming_strings">
4307+
<term><varname>standard_conforming_strings</varname> (<type>boolean</type>)</term>
43084308
<indexterm><primary>strings</><secondary>escape</></>
43094309
<indexterm>
4310-
<primary><varname>standard_compliant_strings</> configuration parameter</primary>
4310+
<primary><varname>standard_conforming_strings</> configuration parameter</primary>
43114311
</indexterm>
43124312
<listitem>
43134313
<para>

‎doc/src/sgml/syntax.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.102 2005/06/26 19:16:05 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.103 2005/08/14 22:19:50 petere Exp $
33
-->
44

55
<chapter id="sql-syntax">
@@ -274,7 +274,7 @@ UPDATE "my_table" SET "a" = 5;
274274
While ordinary strings now support C-style backslash escapes,
275275
future versions will generate warnings for such usage and
276276
eventually treat backslashes as literal characters to be
277-
standard-compliant. The proper way to specify escape processing is
277+
standard-conforming. The proper way to specify escape processing is
278278
to use the escape string syntax to indicate that escape
279279
processing is desired. Escape string syntax is specified by writing
280280
the letter <literal>E</literal> (upper or lower case) just before

‎src/backend/utils/misc/guc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.281 2005/08/11 21:11:47 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.282 2005/08/14 22:19:50 petere Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -202,7 +202,7 @@ static int max_index_keys;
202202
static int max_identifier_length;
203203
static int block_size;
204204
static bool integer_datetimes;
205-
static bool standard_compliant_strings;
205+
static bool standard_conforming_strings;
206206

207207
/* should be static, but commands/variable.c needs to get at these */
208208
char *role_string;
@@ -930,12 +930,12 @@ static struct config_bool ConfigureNamesBool[] =
930930
},
931931

932932
{
933-
{"standard_compliant_strings", PGC_INTERNAL, PRESET_OPTIONS,
933+
{"standard_conforming_strings", PGC_INTERNAL, PRESET_OPTIONS,
934934
gettext_noop("'...' strings treat backslashes literally."),
935935
NULL,
936936
GUC_REPORT | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
937937
},
938-
&standard_compliant_strings,
938+
&standard_conforming_strings,
939939
false, NULL, NULL
940940
},
941941

0 commit comments

Comments
 (0)