firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 15:23:02 +01:00
Code Issues

Fixed CORE-1522 - Inconsistent DATEDIFF behaviour

Browse Source
This commit is contained in:
asfernandes 2007-10-17 14:17:02 +00:00
parent 37edffb67b
commit e443c2b9ed
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/jrd/SysFunction.cpp
View File

@ -65,7 +65,7 @@ enum Function
const static int oneDay = 86400;
// auxiliary functions
void static add10msec(ISC_TIMESTAMP* v, int msec, SINT64 multiplier);
static void add10msec(ISC_TIMESTAMP* v, int msec, SINT64 multiplier);
static double cot(double value);
// generic setParams functions
@ -144,7 +144,7 @@ static dsc* evlSqrt(Jrd::thread_db* tdbb, const SysFunction* function, Jrd::jrd_
static dsc* evlTrunc(Jrd::thread_db* tdbb, const SysFunction* function, Jrd::jrd_nod* args, Jrd::impure_value* impure);
void static add10msec(ISC_TIMESTAMP* v, int msec, SINT64 multiplier)
static void add10msec(ISC_TIMESTAMP* v, int msec, SINT64 multiplier)
{
SINT64 full = msec * multiplier;
int days = full / (oneDay * ISC_TIME_SECONDS_PRECISION);
@ -1330,6 +1330,25 @@ static dsc* evlDateDiff(Jrd::thread_db* tdbb, const SysFunction* function, Jrd::
timestamp2.decode(&times2);
SLONG part = MOV_get_long(partDsc, 0);
switch (part)
{
case blr_extract_hour:
times1.tm_min = 0;
times2.tm_min = 0;
// fall through
case blr_extract_minute:
times1.tm_sec = 0;
times2.tm_sec = 0;
// fall through
case blr_extract_second:
timestamp1.encode(&times1);
timestamp2.encode(&times2);
break;
}
SINT64 result;
// ASF: throw error if at least one value is "incomplete" from the EXTRACT POV