Use "data directory" not "current directory" in error messages.

tglsfdc · tglsfdc · commit 2333803d84dd · 2023-03-16T12:04:08.000-04:00
The user receiving the message might not understand where the server's "current directory" is. "Data directory" seems clearer. (This would not be good for frontend code, but both of these messages are only issued in the backend.) Kyotaro Horiguchi Discussion: https://postgr.es/m/20230316.111646.1564684434328830712.horikyota.ntt@gmail.com
diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
@@ -97,7 +97,7 @@ convert_and_check_filename(text *arg)
 	else if (!path_is_relative_and_below_cwd(filename))
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("path must be in or below the current directory")));
+				 errmsg("path must be in or below the data directory")));
 
 	return filename;
 }
diff --git a/contrib/adminpack/expected/adminpack.out b/contrib/adminpack/expected/adminpack.out
@@ -41,7 +41,7 @@ GRANT pg_read_all_settings TO regress_adminpack_user1;
 GRANT EXECUTE ON FUNCTION pg_file_write(text,text,bool) TO regress_adminpack_user1;
 SET ROLE regress_adminpack_user1;
 SELECT pg_file_write('../test_file0', 'test0', false);
-ERROR:  path must be in or below the current directory
+ERROR:  path must be in or below the data directory
 SELECT pg_file_write('/tmp/test_file0', 'test0', false);
 ERROR:  absolute path not allowed
 SELECT pg_file_write(current_setting('data_directory') || '/test_file4', 'test4', false);
diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
@@ -86,7 +86,7 @@ convert_and_check_filename(text *arg)
 	else if (!path_is_relative_and_below_cwd(filename))
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("path must be in or below the current directory")));
+				 errmsg("path must be in or below the data directory")));
 
 	return filename;
 }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ convert_and_check_filename(text *arg)`
`97`	`97`	`else if (!path_is_relative_and_below_cwd(filename))`
`98`	`98`	`ereport(ERROR,`
`99`	`99`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`100`		`- errmsg("path must be in or below the current directory")));`
	`100`	`+ errmsg("path must be in or below the data directory")));`
`101`	`101`
`102`	`102`	`return filename;`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ convert_and_check_filename(text *arg)`
`86`	`86`	`else if (!path_is_relative_and_below_cwd(filename))`
`87`	`87`	`ereport(ERROR,`
`88`	`88`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`89`		`- errmsg("path must be in or below the current directory")));`
	`89`	`+ errmsg("path must be in or below the data directory")));`
`90`	`90`
`91`	`91`	`return filename;`
`92`	`92`	`}`