Fix error messages for FreeFile in COPY command.

ItGacky · ItGacky · commit fb7355e0cedf · 2011-02-07T10:46:56.000+09:00
They are extracted from COPY API patch.

suggested by Noah Misch
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -1319,7 +1319,7 @@ DoCopyTo(CopyState cstate)
 		if (FreeFile(cstate->copy_file))
 			ereport(ERROR,
 					(errcode_for_file_access(),
-					 errmsg("could not write to file \"%s\": %m",
+					 errmsg("could not close file \"%s\": %m",
 							cstate->filename)));
 	}
 }
@@ -2263,7 +2263,7 @@ CopyFrom(CopyState cstate)
 		if (FreeFile(cstate->copy_file))
 			ereport(ERROR,
 					(errcode_for_file_access(),
-					 errmsg("could not read from file \"%s\": %m",
+					 errmsg("could not close file \"%s\": %m",
 							cstate->filename)));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1319,7 +1319,7 @@ DoCopyTo(CopyState cstate)`
`1319`	`1319`	`if (FreeFile(cstate->copy_file))`
`1320`	`1320`	`ereport(ERROR,`
`1321`	`1321`	`(errcode_for_file_access(),`
`1322`		`- errmsg("could not write to file \"%s\": %m",`
	`1322`	`+ errmsg("could not close file \"%s\": %m",`
`1323`	`1323`	`cstate->filename)));`
`1324`	`1324`	`}`
`1325`	`1325`	`}`
`@@ -2263,7 +2263,7 @@ CopyFrom(CopyState cstate)`
`2263`	`2263`	`if (FreeFile(cstate->copy_file))`
`2264`	`2264`	`ereport(ERROR,`
`2265`	`2265`	`(errcode_for_file_access(),`
`2266`		`- errmsg("could not read from file \"%s\": %m",`
	`2266`	`+ errmsg("could not close file \"%s\": %m",`
`2267`	`2267`	`cstate->filename)));`
`2268`	`2268`	`}`
`2269`	`2269`