Fix dumping of comments on invalid constraints on domains

We skip dumping constraints together with domains if they are invalid
('separate') so that they appear after data -- but their comments were
dumped together with the domain definition, which in effect leads to the
comment being dumped when the constraint does not yet exist.  Delay
them in the same way.

Oversight in 7eca575d1c28; backpatch all the way back.

Author: jian he <[email protected]>
Discussion: https://postgr.es/m/CACJufxF_C2pe6J_+nPr6C5jf5rQnbYP8XOKr4HM8yHZtp2aQqQ@mail.gmail.com

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 1937997ea674d23303a737605404058189280f9d..c6226175528bbad9929d0ccb8c1d7d8948550c28 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12583,8 +12583,13 @@ dumpDomain(Archive *fout, const TypeInfo *tyinfo)
    for (i = 0; i < tyinfo->nDomChecks; i++)
    {
        ConstraintInfo *domcheck = &(tyinfo->domChecks[i]);
-       PQExpBuffer conprefix = createPQExpBuffer();
+       PQExpBuffer conprefix;
 
+       /* but only if the constraint itself was dumped here */
+       if (domcheck->separate)
+           continue;
+
+       conprefix = createPQExpBuffer();
        appendPQExpBuffer(conprefix, "CONSTRAINT %s ON DOMAIN",
                          fmtId(domcheck->dobj.name));
 
@@ -18488,6 +18493,22 @@ dumpConstraint(Archive *fout, const ConstraintInfo *coninfo)
                                          .section = SECTION_POST_DATA,
                                          .createStmt = q->data,
                                          .dropStmt = delq->data));
+
+           if (coninfo->dobj.dump & DUMP_COMPONENT_COMMENT)
+           {
+               PQExpBuffer conprefix = createPQExpBuffer();
+               char       *qtypname = pg_strdup(fmtId(tyinfo->dobj.name));
+
+               appendPQExpBuffer(conprefix, "CONSTRAINT %s ON DOMAIN",
+                                 fmtId(coninfo->dobj.name));
+
+               dumpComment(fout, conprefix->data, qtypname,
+                           tyinfo->dobj.namespace->dobj.name,
+                           tyinfo->rolname,
+                           coninfo->dobj.catId, 0, tyinfo->dobj.dumpId);
+               destroyPQExpBuffer(conprefix);
+               free(qtypname);
+           }
        }
    }
    else

diff --git a/src/test/regress/expected/constraints.out b/src/test/regress/expected/constraints.out
index ccea883cffd65458e03e01e09ac934ca7675330a..3590d3274f05a8c1b188407d3308a8d1ece55d62 100644 (file)
--- a/src/test/regress/expected/constraints.out
+++ b/src/test/regress/expected/constraints.out
@@ -1701,3 +1701,7 @@ DROP TABLE constraint_comments_tbl;
 DROP DOMAIN constraint_comments_dom;
 DROP ROLE regress_constraint_comments;
 DROP ROLE regress_constraint_comments_noaccess;
+-- Leave some constraints for the pg_upgrade test to pick up
+CREATE DOMAIN constraint_comments_dom AS int;
+ALTER DOMAIN constraint_comments_dom ADD CONSTRAINT inv_ck CHECK (value > 0) NOT VALID;
+COMMENT ON CONSTRAINT inv_ck ON DOMAIN constraint_comments_dom IS 'comment on invalid constraint';

diff --git a/src/test/regress/sql/constraints.sql b/src/test/regress/sql/constraints.sql
index 7487723ab843786c27b43a43ccfa56e5c98c7079..1f6dc8fd69f6d22b1fc0b460b7a2ca845f8703ae 100644 (file)
--- a/src/test/regress/sql/constraints.sql
+++ b/src/test/regress/sql/constraints.sql
@@ -1043,3 +1043,9 @@ DROP DOMAIN constraint_comments_dom;
 
 DROP ROLE regress_constraint_comments;
 DROP ROLE regress_constraint_comments_noaccess;
+
+-- Leave some constraints for the pg_upgrade test to pick up
+CREATE DOMAIN constraint_comments_dom AS int;
+
+ALTER DOMAIN constraint_comments_dom ADD CONSTRAINT inv_ck CHECK (value > 0) NOT VALID;
+COMMENT ON CONSTRAINT inv_ck ON DOMAIN constraint_comments_dom IS 'comment on invalid constraint';