Rename GUC json_as_jsonb to sql_json

Author: Nikita Glukhov

doc/src/sgml/config.sgml

@@ -9510,19 +9510,20 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
       </listitem>
      </varlistentry>
 
-     <varlistentry id="guc-json-as-jsonb" xreflabel="json_as_jsonb">
-      <term><varname>json_as_jsonb</varname> (<type>boolean</type>)
+     <varlistentry id="guc-sql-json" xreflabel="sql_json">
+      <term><varname>sql_json</varname> (<type>enum</type>)
       <indexterm><primary>json</primary></indexterm>
       <indexterm><primary>jsonb</primary></indexterm>
       <indexterm>
-       <primary><varname>json_as_jsonb</varname> configuration parameter</primary>
+       <primary><varname>sql_json</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-         When on, SQL type <type>JSON</type> is mapped to
-         <productname>PostgreSQL</productname> type <type>jsonb</type>.
-         But SQL type <type>JSON TEXT</type> is always mapped to
+         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>.
        </para>
       </listitem>

src/backend/parser/gram.y

@@ -12940,7 +12940,7 @@ interval_second:
 JsonType:
 			JSON
 				{
-					$$ = SystemTypeName(json_as_jsonb ? "jsonb" : "json");
+					$$ = SystemTypeName(SQLJSON_TYPE_NAME());
 					$$->location = @1;
 				}
 			| JSON TEXT_P
@@ -13644,7 +13644,7 @@ c_expr:		columnref								{ $$ = $1; }
 			  }
 			| JSON '(' a_expr ')'
 				{
-					List	   *typname = list_make1(makeString(json_as_jsonb ? "jsonb" : "json"));
+					List	   *typname = list_make1(makeString(SQLJSON_TYPE_NAME()));
 
 					$$ = (Node *) makeFuncCall(typname, list_make1($3), COERCE_EXPLICIT_CALL, @1);
 				}

src/backend/utils/adt/format_type.c

@@ -297,11 +297,11 @@ format_type_extended(Oid type_oid, int32 typemod, bits16 flags)
 			break;
 
 		case JSONBOID:
-			buf = pstrdup(json_as_jsonb ? "json" : "jsonb");
+			buf = pstrdup(SQLJSON_TYPE_IS_JSONB() ? "json" : "jsonb");
 			break;
 
 		case JSONOID:
-			buf = pstrdup(json_as_jsonb ? "json text" : "json");
+			buf = pstrdup(SQLJSON_TYPE_IS_JSONB() ? "json text" : "json");
 			break;
 	}
 

src/backend/utils/adt/jsonb.c

@@ -100,7 +100,7 @@ static char *JsonbToCStringWorker(StringInfo out, JsonbContainer *in,
 								  int estimated_len, JsonFormat format);
 static void add_indent(StringInfo out, bool indent, int level);
 
-bool json_as_jsonb;		/* GUC for mapping jsonb to SQL/JSON JSON */
+int			sql_json_type;		/* GUC for mapping jsonb to SQL/JSON JSON */
 
 /*
  * jsonb type input function

src/backend/utils/misc/guc.c

@@ -499,6 +499,12 @@ static struct config_enum_entry shared_memory_options[] = {
 	{NULL, 0, false}
 };
 
+const struct config_enum_entry sql_json_type_info[] = {
+	{"json", SQLJSON_TYPE_JSON, false},
+	{"jsonb", SQLJSON_TYPE_JSONB, false},
+	{NULL, 0, false}
+};
+
 /*
  * Options for enum values stored in other modules
  */
@@ -2037,17 +2043,6 @@ static struct config_bool ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 
-	{
-		{"json_as_jsonb", PGC_USERSET, COMPAT_OPTIONS_CLIENT,
-			gettext_noop("Use jsonb type as default implementation of SQL JSON type."),
-			gettext_noop("When turned on, jsonb type is mapped to SQL JSON type, "
-						 "json type is mapped to JSON TEXT type.")
-		},
-		&json_as_jsonb,
-		false,
-		NULL, NULL, NULL
-	},
-
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL, NULL
@@ -4796,6 +4791,17 @@ static struct config_enum ConfigureNamesEnum[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"sql_json", PGC_USERSET, COMPAT_OPTIONS_CLIENT,
+			gettext_noop("Sets what PostgreSQL type to use as an implementaion of SQL JSON type."),
+			NULL
+		},
+		&sql_json_type,
+		SQLJSON_TYPE_JSON,
+		sql_json_type_info,
+		NULL, NULL, NULL
+	},
+
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, 0, NULL, NULL, NULL, NULL

src/backend/utils/misc/postgresql.conf.sample

@@ -749,6 +749,7 @@
 # - Other Platforms and Clients -
 
 #transform_null_equals = off
+#sql_json = json # jsonb
 
 
 #------------------------------------------------------------------------------

src/include/utils/jsonb.h

@@ -402,6 +402,16 @@ extern void JsonbHashScalarValueExtended(const JsonbValue *scalarVal,
 extern int reserveFromBuffer(StringInfo buffer, int len);
 extern void appendToBuffer(StringInfo buffer, const void *data, int len);
 
-extern bool json_as_jsonb;	/* GUC */
+typedef enum SqlJsonType
+{
+	SQLJSON_TYPE_JSON = 0,
+	SQLJSON_TYPE_JSONB = 1
+} SqlJsonType;
+
+#define SQLJSON_TYPE_IS_JSONB() (sql_json_type == SQLJSON_TYPE_JSONB)
+#define SQLJSON_TYPE_OID() (SQLJSON_TYPE_IS_JSONB() ? JSONBOID : JSONOID)
+#define SQLJSON_TYPE_NAME() (SQLJSON_TYPE_IS_JSONB() ? "jsonb" : "json")
+
+extern int sql_json_type;	/* GUC */
 
 #endif							/* __JSONB_H__ */

src/test/regress/expected/jsonb.out

@@ -5044,7 +5044,7 @@ create table test_json_as_json (js json, jb jsonb);
  js     | json  |           |          | 
  jb     | jsonb |           |          | 
 
-set json_as_jsonb = on;
+set sql_json = jsonb;
 select json(' { "aa": 1, "b" : 2 }');
        jsonb       
 -------------------
@@ -5109,7 +5109,7 @@ select json_object_field(jt, 'a') from test_json_as_jsonb;
  1
 (1 row)
 
-set json_as_jsonb = off;
+set sql_json = json;
 \d test_json_as_jsonb
         Table "public.test_json_as_jsonb"
  Column | Type  | Collation | Nullable | Default 

src/test/regress/sql/jsonb.sql

@@ -1289,7 +1289,7 @@ select json text ' { "aa": 1, "b" : 2 }';
 create table test_json_as_json (js json, jb jsonb);
 \d test_json_as_json
 
-set json_as_jsonb = on;
+set sql_json = jsonb;
 
 select json(' { "aa": 1, "b" : 2 }');
 select json ' { "aa": 1, "b" : 2 }';
@@ -1309,7 +1309,7 @@ select jsonb_object_field(jb, 'a') from test_json_as_jsonb;
 select jsonb_object_field(jt, 'a') from test_json_as_jsonb;
 select json_object_field(jt, 'a') from test_json_as_jsonb;
 
-set json_as_jsonb = off;
+set sql_json = json;
 \d test_json_as_jsonb
 
 select * from test_json_as_jsonb;