Fix EncodeSpecialTimestamp to throw error on unrecognized input, rather than
returning a failure code that none of its callers bothered to check for.
This commit is contained in:
parent
f346a232ed
commit
791359fe0e
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.192 2008/09/11 15:27:30 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.193 2008/10/14 15:44:29 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -64,7 +64,7 @@ typedef struct
|
||||
|
||||
|
||||
static TimeOffset time2t(const int hour, const int min, const int sec, const fsec_t fsec);
|
||||
static int EncodeSpecialTimestamp(Timestamp dt, char *str);
|
||||
static void EncodeSpecialTimestamp(Timestamp dt, char *str);
|
||||
static Timestamp dt2local(Timestamp dt, int timezone);
|
||||
static void AdjustTimestampForTypmod(Timestamp *time, int32 typmod);
|
||||
static void AdjustIntervalForTypmod(Interval *interval, int32 typmod);
|
||||
@ -1150,18 +1150,16 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
|
||||
/* EncodeSpecialTimestamp()
|
||||
* Convert reserved timestamp data type to string.
|
||||
*/
|
||||
static int
|
||||
static void
|
||||
EncodeSpecialTimestamp(Timestamp dt, char *str)
|
||||
{
|
||||
if (TIMESTAMP_IS_NOBEGIN(dt))
|
||||
strcpy(str, EARLY);
|
||||
else if (TIMESTAMP_IS_NOEND(dt))
|
||||
strcpy(str, LATE);
|
||||
else
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
} /* EncodeSpecialTimestamp() */
|
||||
else /* shouldn't happen */
|
||||
elog(ERROR, "invalid argument for EncodeSpecialTimestamp");
|
||||
}
|
||||
|
||||
Datum
|
||||
now(PG_FUNCTION_ARGS)
|
||||
|
Loading…
x
Reference in New Issue
Block a user