Replace type JSON TEXT with pg_catalog.json

Nikita Glukhov · Nikita Glukhov · commit 49ff9aba6527 · 2020-11-24T19:18:19.000+03:00
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
@@ -9523,8 +9523,9 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
          Valid values are <literal>json</literal> and <literal>jsonb</literal>.
          Specifies what <productname>PostgreSQL</productname> type is used
          as an implementation of SQL type <type>JSON</type>.
-         SQL type <type>JSON TEXT</type> is always mapped to
-         <productname>PostgreSQL</productname> type <type>json</type>.
+         When <varname>sql_json</varname> is set to <literal>jsonb</literal>,
+         <productname>PostgreSQL</productname> type <type>json</type> can be
+         accessed using explicit qualification <type>pg_catalog.json</type>.
        </para>
       </listitem>
      </varlistentry>
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -776,8 +776,6 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %left		'*' '/' '%'
 %left		'^'
 /* Unary Operators */
-%nonassoc	JSON
-%left		TEXT_P			/* sets precedence for JSON TEXT */
 %left		AT				/* sets precedence for AT TIME ZONE */
 %left		COLLATE
 %right		UMINUS
@@ -12943,11 +12941,6 @@ JsonType:
 					$$ = SystemTypeName(SQLJSON_TYPE_NAME());
 					$$->location = @1;
 				}
-			| JSON TEXT_P
-				{
-					$$ = SystemTypeName("json");
-					$$->location = @1;
-				}
 		;
 
 
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
@@ -301,7 +301,7 @@ format_type_extended(Oid type_oid, int32 typemod, bits16 flags)
 			break;
 
 		case JSONOID:
-			buf = pstrdup(SQLJSON_TYPE_IS_JSONB() ? "json text" : "json");
+			buf = pstrdup(SQLJSON_TYPE_IS_JSONB() ? "pg_catalog.json" : "json");
 			break;
 	}
 
diff --git a/src/test/regress/expected/jsonb.out b/src/test/regress/expected/jsonb.out
@@ -5030,7 +5030,7 @@ select json ' { "aa": 1, "b" : 2 }';
   { "aa": 1, "b" : 2 }
 (1 row)
 
-select json text ' { "aa": 1, "b" : 2 }';
+select pg_catalog.json ' { "aa": 1, "b" : 2 }';
          json          
 -----------------------
   { "aa": 1, "b" : 2 }
@@ -5057,27 +5057,27 @@ select json ' { "aa": 1, "b" : 2 }';
  {"b": 2, "aa": 1}
 (1 row)
 
-select json text ' { "aa": 1, "b" : 2 }';
+select pg_catalog.json ' { "aa": 1, "b" : 2 }';
          json          
 -----------------------
   { "aa": 1, "b" : 2 }
 (1 row)
 
 \d test_json_as_json
-          Table "public.test_json_as_json"
- Column |   Type    | Collation | Nullable | Default 
---------+-----------+-----------+----------+---------
- js     | json text |           |          | 
- jb     | json      |           |          | 
+             Table "public.test_json_as_json"
+ Column |      Type       | Collation | Nullable | Default 
+--------+-----------------+-----------+----------+---------
+ js     | pg_catalog.json |           |          | 
+ jb     | json            |           |          | 
 
-create table test_json_as_jsonb (js json, jb jsonb, jt json text);
+create table test_json_as_jsonb (js json, jb jsonb, jt pg_catalog.json);
 \d test_json_as_jsonb
-          Table "public.test_json_as_jsonb"
- Column |   Type    | Collation | Nullable | Default 
---------+-----------+-----------+----------+---------
- js     | json      |           |          | 
- jb     | json      |           |          | 
- jt     | json text |           |          | 
+             Table "public.test_json_as_jsonb"
+ Column |      Type       | Collation | Nullable | Default 
+--------+-----------------+-----------+----------+---------
+ js     | json            |           |          | 
+ jb     | json            |           |          | 
+ jt     | pg_catalog.json |           |          | 
 
 insert into test_json_as_jsonb values ('{ "a" : 1 }', '{ "a" : 1 }', '{ "a" : 1 }');
 select * from test_json_as_jsonb;
@@ -5099,7 +5099,7 @@ select jsonb_object_field(jb, 'a') from test_json_as_jsonb;
 (1 row)
 
 select jsonb_object_field(jt, 'a') from test_json_as_jsonb;
-ERROR:  function jsonb_object_field(json text, unknown) does not exist
+ERROR:  function jsonb_object_field(pg_catalog.json, unknown) does not exist
 LINE 1: select jsonb_object_field(jt, 'a') from test_json_as_jsonb;
                ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
diff --git a/src/test/regress/sql/jsonb.sql b/src/test/regress/sql/jsonb.sql
@@ -1284,7 +1284,7 @@ select '12345.0000000000000000000000000000000000000000000005'::jsonb::int8;
 -- test mapping of jsonb to SQL/JSON JSON type
 select json(' { "aa": 1, "b" : 2 }');
 select json ' { "aa": 1, "b" : 2 }';
-select json text ' { "aa": 1, "b" : 2 }';
+select pg_catalog.json ' { "aa": 1, "b" : 2 }';
 
 create table test_json_as_json (js json, jb jsonb);
 \d test_json_as_json
@@ -1293,11 +1293,11 @@ set sql_json = jsonb;
 
 select json(' { "aa": 1, "b" : 2 }');
 select json ' { "aa": 1, "b" : 2 }';
-select json text ' { "aa": 1, "b" : 2 }';
+select pg_catalog.json ' { "aa": 1, "b" : 2 }';
 
 \d test_json_as_json
 
-create table test_json_as_jsonb (js json, jb jsonb, jt json text);
+create table test_json_as_jsonb (js json, jb jsonb, jt pg_catalog.json);
 \d test_json_as_jsonb
 
 insert into test_json_as_jsonb values ('{ "a" : 1 }', '{ "a" : 1 }', '{ "a" : 1 }');

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ format_type_extended(Oid type_oid, int32 typemod, bits16 flags)`
`301`	`301`	`break;`
`302`	`302`
`303`	`303`	`case JSONOID:`
`304`		`- buf = pstrdup(SQLJSON_TYPE_IS_JSONB() ? "json text" : "json");`
	`304`	`+ buf = pstrdup(SQLJSON_TYPE_IS_JSONB() ? "pg_catalog.json" : "json");`
`305`	`305`	`break;`
`306`	`306`	`}`
`307`	`307`