Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 2f2b18b

Browse files
committed
Revert SQL/JSON features
The reverts the following and makes some associated cleanups: commit f79b803: Common SQL/JSON clauses commit f4fb45d: SQL/JSON constructors commit 5f0adec: Make STRING an unreserved_keyword. commit 33a3776: IS JSON predicate commit 1a36bc9: SQL/JSON query functions commit 606948b: SQL JSON functions commit 49082c2: RETURNING clause for JSON() and JSON_SCALAR() commit 4e34747: JSON_TABLE commit fadb48b: PLAN clauses for JSON_TABLE commit 2ef6f11: Reduce running time of jsonb_sqljson test commit 14d3f24: Further improve jsonb_sqljson parallel test commit a6baa4b: Documentation for SQL/JSON features commit b46bcf7: Improve readability of SQL/JSON documentation. commit 112fdb3: Fix finalization for json_objectagg and friends commit fcdb35c: Fix transformJsonBehavior commit 4cd8717: Improve a couple of sql/json error messages commit f7a605f: Small cleanups in SQL/JSON code commit 9c3d25e: Fix JSON_OBJECTAGG uniquefying bug commit a79153b: Claim SQL standard compliance for SQL/JSON features commit a1e7616: Rework SQL/JSON documentation commit 8d9f963: Fix errors in copyfuncs/equalfuncs support for JSON node types. commit 3c633f3: Only allow returning string types or bytea from json_serialize commit 67b2670: expression eval: Fix EEOP_JSON_CONSTRUCTOR and EEOP_JSONEXPR size. The release notes are also adjusted. Backpatch to release 15. Discussion: https://postgr.es/m/40d2c882-bcac-19a9-754d-4299e1d87ac7@postgresql.org
1 parent 90247e7 commit 2f2b18b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+348
-14893
lines changed

doc/src/sgml/func.sgml

+6-1,059
Large diffs are not rendered by default.

doc/src/sgml/keywords/sql2016-02-reserved.txt

-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ INTERVAL
157157
INTO
158158
IS
159159
JOIN
160-
JSON
161160
JSON_ARRAY
162161
JSON_ARRAYAGG
163162
JSON_EXISTS

src/backend/catalog/sql_features.txt

+15-15
Original file line numberDiff line numberDiff line change
@@ -527,28 +527,28 @@ T652 SQL-dynamic statements in SQL routines NO
527527
T653 SQL-schema statements in external routines YES
528528
T654 SQL-dynamic statements in external routines NO
529529
T655 Cyclically dependent routines YES
530-
T811 Basic SQL/JSON constructor functions YES
531-
T812 SQL/JSON: JSON_OBJECTAGG YES
532-
T813 SQL/JSON: JSON_ARRAYAGG with ORDER BY YES
533-
T814 Colon in JSON_OBJECT or JSON_OBJECTAGG YES
534-
T821 Basic SQL/JSON query operators YES
535-
T822 SQL/JSON: IS JSON WITH UNIQUE KEYS predicate YES
536-
T823 SQL/JSON: PASSING clause YES
537-
T824 JSON_TABLE: specific PLAN clause YES
538-
T825 SQL/JSON: ON EMPTY and ON ERROR clauses YES
539-
T826 General value expression in ON ERROR or ON EMPTY clauses YES
540-
T827 JSON_TABLE: sibling NESTED COLUMNS clauses YES
541-
T828 JSON_QUERY YES
542-
T829 JSON_QUERY: array wrapper options YES
543-
T830 Enforcing unique keys in SQL/JSON constructor functions YES
530+
T811 Basic SQL/JSON constructor functions NO
531+
T812 SQL/JSON: JSON_OBJECTAGG NO
532+
T813 SQL/JSON: JSON_ARRAYAGG with ORDER BY NO
533+
T814 Colon in JSON_OBJECT or JSON_OBJECTAGG NO
534+
T821 Basic SQL/JSON query operators NO
535+
T822 SQL/JSON: IS JSON WITH UNIQUE KEYS predicate NO
536+
T823 SQL/JSON: PASSING clause NO
537+
T824 JSON_TABLE: specific PLAN clause NO
538+
T825 SQL/JSON: ON EMPTY and ON ERROR clauses NO
539+
T826 General value expression in ON ERROR or ON EMPTY clauses NO
540+
T827 JSON_TABLE: sibling NESTED COLUMNS clauses NO
541+
T828 JSON_QUERY NO
542+
T829 JSON_QUERY: array wrapper options NO
543+
T830 Enforcing unique keys in SQL/JSON constructor functions NO
544544
T831 SQL/JSON path language: strict mode YES
545545
T832 SQL/JSON path language: item method YES
546546
T833 SQL/JSON path language: multiple subscripts YES
547547
T834 SQL/JSON path language: wildcard member accessor YES
548548
T835 SQL/JSON path language: filter expressions YES
549549
T836 SQL/JSON path language: starts with predicate YES
550550
T837 SQL/JSON path language: regex_like predicate YES
551-
T838 JSON_TABLE: PLAN DEFAULT clause YES
551+
T838 JSON_TABLE: PLAN DEFAULT clause NO
552552
T839 Formatted cast of datetimes to/from character strings NO
553553
M001 Datalinks NO
554554
M002 Datalinks via SQL/CLI NO

src/backend/commands/explain.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -3851,13 +3851,7 @@ ExplainTargetRel(Plan *plan, Index rti, ExplainState *es)
38513851
break;
38523852
case T_TableFuncScan:
38533853
Assert(rte->rtekind == RTE_TABLEFUNC);
3854-
if (rte->tablefunc)
3855-
if (rte->tablefunc->functype == TFT_XMLTABLE)
3856-
objectname = "xmltable";
3857-
else /* Must be TFT_JSON_TABLE */
3858-
objectname = "json_table";
3859-
else
3860-
objectname = NULL;
3854+
objectname = "xmltable";
38613855
objecttag = "Table Function Name";
38623856
break;
38633857
case T_ValuesScan:

0 commit comments

Comments
 (0)