Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2020-03-06 19:17:43 +0000
committerTom Lane2020-03-06 19:17:43 +0000
commita6525588b7c21fd8539e9a43ec9c5c245ed1cc91 (patch)
tree7412dc346309839f3bb0292ec2648d84300af5b6 /doc/src/sgml/json.sgml
parentfe30e7ebfa3846416f1adeb7cf611006513a4ee0 (diff)
Allow Unicode escapes in any server encoding, not only UTF-8.
SQL includes provisions for numeric Unicode escapes in string literals and identifiers. Previously we only accepted those if they represented ASCII characters or the server encoding was UTF-8, making the conversion to internal form trivial. This patch adjusts things so that we'll call the appropriate encoding conversion function in less-trivial cases, allowing the escape sequence to be accepted so long as it corresponds to some character available in the server encoding. This also applies to processing of Unicode escapes in JSONB. However, the old restriction still applies to client-side JSON processing, since that hasn't got access to the server's encoding conversion infrastructure. This patch includes some lexer infrastructure that simplifies throwing errors with error cursors pointing into the middle of a string (or other complex token). For the moment I only used it for errors relating to Unicode escapes, but we might later expand the usage to some other cases. Patch by me, reviewed by John Naylor. Discussion: https://postgr.es/m/2393.1578958316@sss.pgh.pa.us
Diffstat (limited to 'doc/src/sgml/json.sgml')
-rw-r--r--doc/src/sgml/json.sgml19
1 files changed, 9 insertions, 10 deletions
diff --git a/doc/src/sgml/json.sgml b/doc/src/sgml/json.sgml
index 1b6aaf0a558..a9c68c78ea5 100644
--- a/doc/src/sgml/json.sgml
+++ b/doc/src/sgml/json.sgml
@@ -61,8 +61,8 @@
</para>
<para>
- <productname>PostgreSQL</productname> allows only one character set
- encoding per database. It is therefore not possible for the JSON
+ RFC 7159 specifies that JSON strings should be encoded in UTF8.
+ It is therefore not possible for the JSON
types to conform rigidly to the JSON specification unless the database
encoding is UTF8. Attempts to directly include characters that
cannot be represented in the database encoding will fail; conversely,
@@ -77,13 +77,13 @@
regardless of the database encoding, and are checked only for syntactic
correctness (that is, that four hex digits follow <literal>\u</literal>).
However, the input function for <type>jsonb</type> is stricter: it disallows
- Unicode escapes for non-ASCII characters (those above <literal>U+007F</literal>)
- unless the database encoding is UTF8. The <type>jsonb</type> type also
+ Unicode escapes for characters that cannot be represented in the database
+ encoding. The <type>jsonb</type> type also
rejects <literal>\u0000</literal> (because that cannot be represented in
<productname>PostgreSQL</productname>'s <type>text</type> type), and it insists
that any use of Unicode surrogate pairs to designate characters outside
the Unicode Basic Multilingual Plane be correct. Valid Unicode escapes
- are converted to the equivalent ASCII or UTF8 character for storage;
+ are converted to the equivalent single character for storage;
this includes folding surrogate pairs into a single character.
</para>
@@ -96,9 +96,8 @@
not <type>jsonb</type>. The fact that the <type>json</type> input function does
not make these checks may be considered a historical artifact, although
it does allow for simple storage (without processing) of JSON Unicode
- escapes in a non-UTF8 database encoding. In general, it is best to
- avoid mixing Unicode escapes in JSON with a non-UTF8 database encoding,
- if possible.
+ escapes in a database encoding that does not support the represented
+ characters.
</para>
</note>
@@ -144,8 +143,8 @@
<row>
<entry><type>string</type></entry>
<entry><type>text</type></entry>
- <entry><literal>\u0000</literal> is disallowed, as are non-ASCII Unicode
- escapes if database encoding is not UTF8</entry>
+ <entry><literal>\u0000</literal> is disallowed, as are Unicode escapes
+ representing characters not available in the database encoding</entry>
</row>
<row>
<entry><type>number</type></entry>