Message style improvements

7 files changed, 25 insertions, 25 deletions

diff --git a/src/test/recovery/t/040_standby_failover_slots_sync.pl b/src/test/recovery/t/040_standby_failover_slots_sync.pl
index 2c51cfc3c86..a474c626d99 100644
--- a/src/test/recovery/t/040_standby_failover_slots_sync.pl
+++ b/src/test/recovery/t/040_standby_failover_slots_sync.pl
@@ -95,7 +95,7 @@ $subscriber1->safe_psql('postgres',
 # Disable failover for enabled subscription
 my ($result, $stdout, $stderr) = $subscriber1->psql('postgres',
 	"ALTER SUBSCRIPTION regress_mysub1 SET (failover = false)");
-ok( $stderr =~ /ERROR:  cannot set failover for enabled subscription/,
+ok( $stderr =~ /ERROR:  cannot set option "failover" for enabled subscription/,
 	"altering failover is not allowed for enabled subscription");
 
 ##################################################
@@ -280,7 +280,7 @@ $standby1->safe_psql('postgres', "SELECT pg_sync_replication_slots();");
 
 # Confirm that the invalidated slot has been dropped.
 $standby1->wait_for_log(
-	qr/dropped replication slot "lsub1_slot" of dbid [0-9]+/, $log_offset);
+	qr/dropped replication slot "lsub1_slot" of database with OID [0-9]+/, $log_offset);
 
 # Confirm that the logical slot has been re-created on the standby and is
 # flagged as 'synced'
@@ -335,7 +335,7 @@ $standby1->reload;
 ($result, $stdout, $stderr) =
   $standby1->psql('postgres', "SELECT pg_sync_replication_slots();");
 ok( $stderr =~
-	  /ERROR:  slot synchronization requires dbname to be specified in primary_conninfo/,
+	  /ERROR:  replication slot synchronization requires "dbname" to be specified in "primary_conninfo"/,
 	"cannot sync slots if dbname is not specified in primary_conninfo");
 
 # Add the dbname back to the primary_conninfo for further tests
@@ -526,10 +526,10 @@ $standby1->reload;
 # Confirm that slot sync worker acknowledge the GUC change and logs the msg
 # about wrong configuration.
 $standby1->wait_for_log(
-	qr/slot sync worker will restart because of a parameter change/,
+	qr/slot synchronization worker will restart because of a parameter change/,
 	$log_offset);
 $standby1->wait_for_log(
-	qr/slot synchronization requires hot_standby_feedback to be enabled/,
+	qr/slot synchronization requires "hot_standby_feedback" to be enabled/,
 	$log_offset);
 
 $log_offset = -s $standby1->logfile;
@@ -678,7 +678,7 @@ is($result, 't', "subscriber2 gets data from primary");
 # Wait until the primary server logs a warning indicating that it is waiting
 # for the sb1_slot to catch up.
 $primary->wait_for_log(
-	qr/replication slot \"sb1_slot\" specified in parameter synchronized_standby_slots does not have active_pid/,
+	qr/replication slot \"sb1_slot\" specified in parameter "synchronized_standby_slots" does not have active_pid/,
 	$offset);
 
 # The regress_mysub1 was enabled for failover so it doesn't get the data from
@@ -757,7 +757,7 @@ $back_q->query_until(
 # Wait until the primary server logs a warning indicating that it is waiting
 # for the sb1_slot to catch up.
 $primary->wait_for_log(
-	qr/replication slot \"sb1_slot\" specified in parameter synchronized_standby_slots does not have active_pid/,
+	qr/replication slot \"sb1_slot\" specified in parameter "synchronized_standby_slots" does not have active_pid/,
 	$offset);
 
 # Remove the standby from the synchronized_standby_slots list and reload the
@@ -798,7 +798,7 @@ $primary->safe_psql('postgres',
 # Wait until the primary server logs a warning indicating that it is waiting
 # for the sb1_slot to catch up.
 $primary->wait_for_log(
-	qr/replication slot \"sb1_slot\" specified in parameter synchronized_standby_slots does not have active_pid/,
+	qr/replication slot \"sb1_slot\" specified in parameter "synchronized_standby_slots" does not have active_pid/,
 	$offset);
 
 # The regress_mysub1 doesn't get the data from primary because the specified
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
index e913f683a68..61a19cdc4ca 100644
--- a/src/test/regress/expected/copy2.out
+++ b/src/test/regress/expected/copy2.out
@@ -740,24 +740,24 @@ CONTEXT:  COPY check_ign_err, line 2, column n: "a"
 -- want context for notices
 \set SHOW_CONTEXT always
 COPY check_ign_err FROM STDIN WITH (on_error ignore, log_verbosity verbose);
-NOTICE:  skipping row due to data type incompatibility at line 2 for column n: "a"
+NOTICE:  skipping row due to data type incompatibility at line 2 for column "n": "a"
 CONTEXT:  COPY check_ign_err
-NOTICE:  skipping row due to data type incompatibility at line 3 for column k: "3333333333"
+NOTICE:  skipping row due to data type incompatibility at line 3 for column "k": "3333333333"
 CONTEXT:  COPY check_ign_err
-NOTICE:  skipping row due to data type incompatibility at line 4 for column m: "{a, 4}"
+NOTICE:  skipping row due to data type incompatibility at line 4 for column "m": "{a, 4}"
 CONTEXT:  COPY check_ign_err
-NOTICE:  skipping row due to data type incompatibility at line 5 for column n: ""
+NOTICE:  skipping row due to data type incompatibility at line 5 for column "n": ""
 CONTEXT:  COPY check_ign_err
-NOTICE:  skipping row due to data type incompatibility at line 7 for column m: "a"
+NOTICE:  skipping row due to data type incompatibility at line 7 for column "m": "a"
 CONTEXT:  COPY check_ign_err
-NOTICE:  skipping row due to data type incompatibility at line 8 for column k: "a"
+NOTICE:  skipping row due to data type incompatibility at line 8 for column "k": "a"
 CONTEXT:  COPY check_ign_err
 NOTICE:  6 rows were skipped due to data type incompatibility
 -- tests for on_error option with log_verbosity and null constraint via domain
 CREATE DOMAIN dcheck_ign_err2 varchar(15) NOT NULL;
 CREATE TABLE check_ign_err2 (n int, m int[], k int, l dcheck_ign_err2);
 COPY check_ign_err2 FROM STDIN WITH (on_error ignore, log_verbosity verbose);
-NOTICE:  skipping row due to data type incompatibility at line 2 for column l: null input
+NOTICE:  skipping row due to data type incompatibility at line 2 for column "l": null input
 CONTEXT:  COPY check_ign_err2
 NOTICE:  1 row was skipped due to data type incompatibility
 -- reset context choice
diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out
index fed3d99b34f..8c04a24b37d 100644
--- a/src/test/regress/expected/foreign_key.out
+++ b/src/test/regress/expected/foreign_key.out
@@ -1972,7 +1972,7 @@ ALTER TABLE fk_partitioned_fk ATTACH PARTITION fk_partitioned_fk_2
 CREATE TABLE fk_partitioned_pk_6 (a int PRIMARY KEY);
 CREATE TABLE fk_partitioned_fk_6 (a int REFERENCES fk_partitioned_pk_6) PARTITION BY LIST (a);
 ALTER TABLE fk_partitioned_fk_6 ATTACH PARTITION fk_partitioned_pk_6 FOR VALUES IN (1);
-ERROR:  can't attach table "fk_partitioned_pk_6" as a partition which is referenced by foreign key "fk_partitioned_fk_6_a_fkey"
+ERROR:  cannot attach table "fk_partitioned_pk_6" as a partition because it is referenced by foreign key "fk_partitioned_fk_6_a_fkey"
 DROP TABLE fk_partitioned_pk_6, fk_partitioned_fk_6;
 -- This case is similar to above, but the referenced relation is one level
 -- lower in the hierarchy.  This one fails in a different way as the above,
diff --git a/src/test/regress/expected/jsonb_jsonpath.out b/src/test/regress/expected/jsonb_jsonpath.out
index 02abaac6891..e534ed96965 100644
--- a/src/test/regress/expected/jsonb_jsonpath.out
+++ b/src/test/regress/expected/jsonb_jsonpath.out
@@ -1906,7 +1906,7 @@ select jsonb_path_query('123', '$.bigint() * 2');
 
 -- Test .boolean()
 select jsonb_path_query('null', '$.boolean()');
-ERROR:  jsonpath item method .boolean() can only be applied to a bool, string, or numeric value
+ERROR:  jsonpath item method .boolean() can only be applied to a boolean, string, or numeric value
 select jsonb_path_query('null', '$.boolean()', silent => true);
  jsonb_path_query 
 ------------------
@@ -1918,9 +1918,9 @@ select jsonb_path_query('[]', '$.boolean()');
 (0 rows)
 
 select jsonb_path_query('[]', 'strict $.boolean()');
-ERROR:  jsonpath item method .boolean() can only be applied to a bool, string, or numeric value
+ERROR:  jsonpath item method .boolean() can only be applied to a boolean, string, or numeric value
 select jsonb_path_query('{}', '$.boolean()');
-ERROR:  jsonpath item method .boolean() can only be applied to a bool, string, or numeric value
+ERROR:  jsonpath item method .boolean() can only be applied to a boolean, string, or numeric value
 select jsonb_path_query('[]', 'strict $.boolean()', silent => true);
  jsonb_path_query 
 ------------------
@@ -2568,7 +2568,7 @@ select jsonb_path_query('12.3', '$.number() * 2');
 
 -- Test .string()
 select jsonb_path_query('null', '$.string()');
-ERROR:  jsonpath item method .string() can only be applied to a bool, string, numeric, or datetime value
+ERROR:  jsonpath item method .string() can only be applied to a boolean, string, numeric, or datetime value
 select jsonb_path_query('null', '$.string()', silent => true);
  jsonb_path_query 
 ------------------
@@ -2580,9 +2580,9 @@ select jsonb_path_query('[]', '$.string()');
 (0 rows)
 
 select jsonb_path_query('[]', 'strict $.string()');
-ERROR:  jsonpath item method .string() can only be applied to a bool, string, numeric, or datetime value
+ERROR:  jsonpath item method .string() can only be applied to a boolean, string, numeric, or datetime value
 select jsonb_path_query('{}', '$.string()');
-ERROR:  jsonpath item method .string() can only be applied to a bool, string, numeric, or datetime value
+ERROR:  jsonpath item method .string() can only be applied to a boolean, string, numeric, or datetime value
 select jsonb_path_query('[]', 'strict $.string()', silent => true);
  jsonb_path_query 
 ------------------
diff --git a/src/test/regress/expected/sqljson_jsontable.out b/src/test/regress/expected/sqljson_jsontable.out
index ca8604a0538..721e01d6ad0 100644
--- a/src/test/regress/expected/sqljson_jsontable.out
+++ b/src/test/regress/expected/sqljson_jsontable.out
@@ -710,7 +710,7 @@ LINE 1: SELECT * FROM JSON_TABLE(jsonb '{"a": 123}', '$' || '.' || '...
 -- JsonPathQuery() error message mentioning column name
 SELECT * FROM JSON_TABLE('{"a": [{"b": "1"}, {"b": "2"}]}', '$' COLUMNS (b json path '$.a[*].b' ERROR ON ERROR));
 ERROR:  JSON path expression for column "b" should return single item without wrapper
-HINT:  Use WITH WRAPPER clause to wrap SQL/JSON items into array.
+HINT:  Use the WITH WRAPPER clause to wrap SQL/JSON items into an array.
 -- JSON_TABLE: nested paths
 -- Duplicate path names
 SELECT * FROM JSON_TABLE(
diff --git a/src/test/regress/expected/sqljson_queryfuncs.out b/src/test/regress/expected/sqljson_queryfuncs.out
index 8b64e3c06b3..73d7d2117ee 100644
--- a/src/test/regress/expected/sqljson_queryfuncs.out
+++ b/src/test/regress/expected/sqljson_queryfuncs.out
@@ -807,7 +807,7 @@ SELECT JSON_QUERY(jsonb '[]', '$[*]' ERROR ON ERROR);	-- NULL ON EMPTY
 
 SELECT JSON_QUERY(jsonb '[1,2]', '$[*]' ERROR ON ERROR);
 ERROR:  JSON path expression in JSON_QUERY should return single item without wrapper
-HINT:  Use WITH WRAPPER clause to wrap SQL/JSON items into array.
+HINT:  Use the WITH WRAPPER clause to wrap SQL/JSON items into an array.
 SELECT JSON_QUERY(jsonb '[1,2]', '$[*]' DEFAULT '"empty"' ON ERROR);
  json_query 
 ------------
diff --git a/src/test/regress/expected/updatable_views.out b/src/test/regress/expected/updatable_views.out
index 420769a40c9..8786058ed0c 100644
--- a/src/test/regress/expected/updatable_views.out
+++ b/src/test/regress/expected/updatable_views.out
@@ -1279,7 +1279,7 @@ MERGE INTO rw_view2 t
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b); -- should fail
 ERROR:  cannot merge into view "rw_view2"
-DETAIL:  MERGE is not supported for views with INSTEAD OF triggers for some actions, but not others.
+DETAIL:  MERGE is not supported for views with INSTEAD OF triggers for some actions but not all.
 HINT:  To enable merging into the view, either provide a full set of INSTEAD OF triggers or drop the existing INSTEAD OF triggers.
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a