mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
Use PRI?64 instead of "ll?" in format strings (continued).
Continuation of work started in commit 15a79c73
, after initial trial.
Author: Thomas Munro <thomas.munro@gmail.com>
Discussion: https://postgr.es/m/b936d2fb-590d-49c3-a615-92c3a88c6c19%40eisentraut.org
This commit is contained in:
@ -798,8 +798,8 @@ retry:
|
||||
cstate->num_errors > cstate->opts.reject_limit)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
|
||||
errmsg("skipped more than REJECT_LIMIT (%lld) rows due to data type incompatibility",
|
||||
(long long) cstate->opts.reject_limit)));
|
||||
errmsg("skipped more than REJECT_LIMIT (%" PRId64 ") rows due to data type incompatibility",
|
||||
cstate->opts.reject_limit)));
|
||||
|
||||
/* Repeat NextCopyFrom() until no soft error occurs */
|
||||
goto retry;
|
||||
@ -855,10 +855,10 @@ fileEndForeignScan(ForeignScanState *node)
|
||||
festate->cstate->num_errors > 0 &&
|
||||
festate->cstate->opts.log_verbosity >= COPY_LOG_VERBOSITY_DEFAULT)
|
||||
ereport(NOTICE,
|
||||
errmsg_plural("%llu row was skipped due to data type incompatibility",
|
||||
"%llu rows were skipped due to data type incompatibility",
|
||||
(unsigned long long) festate->cstate->num_errors,
|
||||
(unsigned long long) festate->cstate->num_errors));
|
||||
errmsg_plural("%" PRIu64 " row was skipped due to data type incompatibility",
|
||||
"%" PRIu64 " rows were skipped due to data type incompatibility",
|
||||
festate->cstate->num_errors,
|
||||
festate->cstate->num_errors));
|
||||
|
||||
EndCopyFrom(festate->cstate);
|
||||
}
|
||||
@ -1319,10 +1319,10 @@ file_acquire_sample_rows(Relation onerel, int elevel,
|
||||
cstate->num_errors > 0 &&
|
||||
cstate->opts.log_verbosity >= COPY_LOG_VERBOSITY_DEFAULT)
|
||||
ereport(NOTICE,
|
||||
errmsg_plural("%llu row was skipped due to data type incompatibility",
|
||||
"%llu rows were skipped due to data type incompatibility",
|
||||
(unsigned long long) cstate->num_errors,
|
||||
(unsigned long long) cstate->num_errors));
|
||||
errmsg_plural("%" PRIu64 " row was skipped due to data type incompatibility",
|
||||
"%" PRIu64 " rows were skipped due to data type incompatibility",
|
||||
cstate->num_errors,
|
||||
cstate->num_errors));
|
||||
|
||||
EndCopyFrom(cstate);
|
||||
|
||||
|
Reference in New Issue
Block a user