Improve quoting in some error messages

diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c
index b31906cbcfdfefd3caf673d8591e34cceb59d78b..3d06be556322edcf8c189e5eb44286e8f3ee35ec 100644 (file)
--- a/contrib/amcheck/verify_nbtree.c
+++ b/contrib/amcheck/verify_nbtree.c
@@ -290,7 +290,7 @@ bt_index_check_internal(Oid indrelid, bool parentcheck, bool heapallindexed,
        if (heaprel == NULL || heapid != IndexGetRelation(indrelid, false))
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_TABLE),
-                                errmsg("could not open parent table of index %s",
+                                errmsg("could not open parent table of index \"%s\"",
                                                RelationGetRelationName(indrel))));
 
        /* Relation suitable for checking as B-Tree? */
@@ -535,7 +535,7 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,
        if (metad->btm_fastroot != metad->btm_root)
                ereport(DEBUG1,
                                (errcode(ERRCODE_NO_DATA),
-                                errmsg_internal("harmless fast root mismatch in index %s",
+                                errmsg_internal("harmless fast root mismatch in index \"%s\"",
                                                RelationGetRelationName(rel)),
                                 errdetail_internal("Fast root block %u (level %u) differs from true root block %u (level %u).",
                                                                        metad->btm_fastroot, metad->btm_fastlevel,
@@ -2277,7 +2277,7 @@ bt_downlink_missing_check(BtreeCheckState *state, bool rightsplit,
        {
                ereport(DEBUG1,
                                (errcode(ERRCODE_NO_DATA),
-                                errmsg_internal("harmless interrupted page split detected in index %s",
+                                errmsg_internal("harmless interrupted page split detected in index \"%s\"",
                                                RelationGetRelationName(state->rel)),
                                 errdetail_internal("Block=%u level=%u left sibling=%u page lsn=%X/%X.",
                                                                        blkno, opaque->btpo_level,

diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c
index f885f3ab3afd697906c9528e8f665e650b82632e..c320e215082a45663fd6ee9e1a38dac87eed9cc8 100644 (file)
--- a/src/backend/access/brin/brin.c
+++ b/src/backend/access/brin/brin.c
@@ -1060,7 +1060,7 @@ brin_summarize_range(PG_FUNCTION_ARGS)
        if (heapRel == NULL || heapoid != IndexGetRelation(indexoid, false))
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_TABLE),
-                                errmsg("could not open parent table of index %s",
+                                errmsg("could not open parent table of index \"%s\"",
                                                RelationGetRelationName(indexRel))));
 
        /* OK, do it */
@@ -1137,7 +1137,7 @@ brin_desummarize_range(PG_FUNCTION_ARGS)
        if (heapRel == NULL || heapoid != IndexGetRelation(indexoid, false))
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_TABLE),
-                                errmsg("could not open parent table of index %s",
+                                errmsg("could not open parent table of index \"%s\"",
                                                RelationGetRelationName(indexRel))));
 
        /* the revmap does the hard work */

diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 9b5afa12ad6d60280fe1f920b73ba35ac79b59cc..5e22479b7ade75eb537262d3365faecba3817107 100644 (file)
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -93,14 +93,14 @@
 #define CHECK_REL_PROCEDURE(pname) \
 do { \
        if (indexRelation->rd_indam->pname == NULL) \
-               elog(ERROR, "function %s is not defined for index %s", \
+               elog(ERROR, "function \"%s\" is not defined for index \"%s\"", \
                         CppAsString(pname), RelationGetRelationName(indexRelation)); \
 } while(0)
 
 #define CHECK_SCAN_PROCEDURE(pname) \
 do { \
        if (scan->indexRelation->rd_indam->pname == NULL) \
-               elog(ERROR, "function %s is not defined for index %s", \
+               elog(ERROR, "function \"%s\" is not defined for index \"%s\"", \
                         CppAsString(pname), RelationGetRelationName(scan->indexRelation)); \
 } while(0)