Avoid unhelpful internal error for incorrect recursive-WITH queries.

checkWellFormedRecursion would issue "missing recursive reference"
if a WITH RECURSIVE query contained a single self-reference but
that self-reference was inside a top-level WITH, ORDER BY, LIMIT,
etc, rather than inside the second arm of the UNION as expected.
We already intended to throw more-on-point errors for such cases,
but those error checks must be done before examining the UNION arm
in order to have the desired results.  So this patch need only
move some code (and improve the comments).

Per bug #18536 from Alexander Lakhin.  Back-patch to all supported
branches.

Discussion: https://postgr.es/m/18536-0a342ec07901203e@postgresql.org

diff --git a/src/backend/parser/parse_cte.c b/src/backend/parser/parse_cte.c
index ac263af07e74516da7a26b9116d52c7af2680fcc..595f762f22b49b5c9b9148906695d1a37553d443 100644 (file)
--- a/src/backend/parser/parse_cte.c
+++ b/src/backend/parser/parse_cte.c
@@ -876,25 +876,14 @@ checkWellFormedRecursion(CteState *cstate)
                            cte->ctename),
                     parser_errposition(cstate->pstate, cte->location)));
 
-       /* The left-hand operand mustn't contain self-reference at all */
-       cstate->curitem = i;
-       cstate->innerwiths = NIL;
-       cstate->selfrefcount = 0;
-       cstate->context = RECURSION_NONRECURSIVETERM;
-       checkWellFormedRecursionWalker((Node *) stmt->larg, cstate);
-       Assert(cstate->innerwiths == NIL);
-
-       /* Right-hand operand should contain one reference in a valid place */
-       cstate->curitem = i;
-       cstate->innerwiths = NIL;
-       cstate->selfrefcount = 0;
-       cstate->context = RECURSION_OK;
-       checkWellFormedRecursionWalker((Node *) stmt->rarg, cstate);
-       Assert(cstate->innerwiths == NIL);
-       if (cstate->selfrefcount != 1)  /* shouldn't happen */
-           elog(ERROR, "missing recursive reference");
-
-       /* WITH mustn't contain self-reference, either */
+       /*
+        * Really, we should insist that there not be a top-level WITH, since
+        * syntactically that would enclose the UNION.  However, we've not
+        * done so in the past and it's probably too late to change.  Settle
+        * for insisting that WITH not contain a self-reference.  Test this
+        * before examining the UNION arms, to avoid issuing confusing errors
+        * in such cases.
+        */
        if (stmt->withClause)
        {
            cstate->curitem = i;
@@ -911,7 +900,9 @@ checkWellFormedRecursion(CteState *cstate)
         * don't make sense because it's impossible to figure out what they
         * mean when we have only part of the recursive query's results. (If
         * we did allow them, we'd have to check for recursive references
-        * inside these subtrees.)
+        * inside these subtrees.  As for WITH, we have to do this before
+        * examining the UNION arms, to avoid issuing confusing errors if
+        * there is a recursive reference here.)
         */
        if (stmt->sortClause)
            ereport(ERROR,
@@ -937,6 +928,28 @@ checkWellFormedRecursion(CteState *cstate)
                     errmsg("FOR UPDATE/SHARE in a recursive query is not implemented"),
                     parser_errposition(cstate->pstate,
                                        exprLocation((Node *) stmt->lockingClause))));
+
+       /*
+        * Now we can get on with checking the UNION operands themselves.
+        *
+        * The left-hand operand mustn't contain a self-reference at all.
+        */
+       cstate->curitem = i;
+       cstate->innerwiths = NIL;
+       cstate->selfrefcount = 0;
+       cstate->context = RECURSION_NONRECURSIVETERM;
+       checkWellFormedRecursionWalker((Node *) stmt->larg, cstate);
+       Assert(cstate->innerwiths == NIL);
+
+       /* Right-hand operand should contain one reference in a valid place */
+       cstate->curitem = i;
+       cstate->innerwiths = NIL;
+       cstate->selfrefcount = 0;
+       cstate->context = RECURSION_OK;
+       checkWellFormedRecursionWalker((Node *) stmt->rarg, cstate);
+       Assert(cstate->innerwiths == NIL);
+       if (cstate->selfrefcount != 1)  /* shouldn't happen */
+           elog(ERROR, "missing recursive reference");
    }
 }
 

diff --git a/src/test/regress/expected/with.out b/src/test/regress/expected/with.out
index 5ccadb504214fa06af8b8ae87e60c66c2d0d7b53..a9e136ca900ca34eaa3254d8220b2a3a2aaab06f 100644 (file)
--- a/src/test/regress/expected/with.out
+++ b/src/test/regress/expected/with.out
@@ -1945,6 +1945,46 @@ WITH RECURSIVE x(n) AS (SELECT n FROM x UNION ALL SELECT 1)
 ERROR:  recursive reference to query "x" must not appear within its non-recursive term
 LINE 1: WITH RECURSIVE x(n) AS (SELECT n FROM x UNION ALL SELECT 1)
                                               ^
+-- allow this, because we historically have
+WITH RECURSIVE x(n) AS (
+  WITH x1 AS (SELECT 1 AS n)
+    SELECT 0
+    UNION
+    SELECT * FROM x1)
+   SELECT * FROM x;
+ n 
+---
+ 0
+ 1
+(2 rows)
+
+-- but this should be rejected
+WITH RECURSIVE x(n) AS (
+  WITH x1 AS (SELECT 1 FROM x)
+    SELECT 0
+    UNION
+    SELECT * FROM x1)
+   SELECT * FROM x;
+ERROR:  recursive reference to query "x" must not appear within a subquery
+LINE 2:   WITH x1 AS (SELECT 1 FROM x)
+                                    ^
+-- and this too
+WITH RECURSIVE x(n) AS (
+  (WITH x1 AS (SELECT 1 FROM x) SELECT * FROM x1)
+  UNION
+  SELECT 0)
+   SELECT * FROM x;
+ERROR:  recursive reference to query "x" must not appear within its non-recursive term
+LINE 2:   (WITH x1 AS (SELECT 1 FROM x) SELECT * FROM x1)
+                                     ^
+-- and this
+WITH RECURSIVE x(n) AS (
+  SELECT 0 UNION SELECT 1
+  ORDER BY (SELECT n FROM x))
+   SELECT * FROM x;
+ERROR:  ORDER BY in a recursive query is not implemented
+LINE 3:   ORDER BY (SELECT n FROM x))
+                   ^
 CREATE TEMPORARY TABLE y (a INTEGER);
 INSERT INTO y SELECT generate_series(1, 10);
 -- LEFT JOIN

diff --git a/src/test/regress/sql/with.sql b/src/test/regress/sql/with.sql
index dc36b7ccb04e0130b04589b50a5037c50ce0bfe7..1c8545b5b0dd067b6e3b82d1f4226de98d51c97c 100644 (file)
--- a/src/test/regress/sql/with.sql
+++ b/src/test/regress/sql/with.sql
@@ -881,6 +881,35 @@ WITH RECURSIVE x(n) AS (SELECT n FROM x)
 WITH RECURSIVE x(n) AS (SELECT n FROM x UNION ALL SELECT 1)
    SELECT * FROM x;
 
+-- allow this, because we historically have
+WITH RECURSIVE x(n) AS (
+  WITH x1 AS (SELECT 1 AS n)
+    SELECT 0
+    UNION
+    SELECT * FROM x1)
+   SELECT * FROM x;
+
+-- but this should be rejected
+WITH RECURSIVE x(n) AS (
+  WITH x1 AS (SELECT 1 FROM x)
+    SELECT 0
+    UNION
+    SELECT * FROM x1)
+   SELECT * FROM x;
+
+-- and this too
+WITH RECURSIVE x(n) AS (
+  (WITH x1 AS (SELECT 1 FROM x) SELECT * FROM x1)
+  UNION
+  SELECT 0)
+   SELECT * FROM x;
+
+-- and this
+WITH RECURSIVE x(n) AS (
+  SELECT 0 UNION SELECT 1
+  ORDER BY (SELECT n FROM x))
+   SELECT * FROM x;
+
 CREATE TEMPORARY TABLE y (a INTEGER);
 INSERT INTO y SELECT generate_series(1, 10);