More fixes per review comments

This commit is contained in:
David Puglielli 2018-03-14 16:45:54 -07:00
parent d025172a8e
commit ebfc750023

View file

@ -106,7 +106,8 @@ function CompareDateTimeString($datetimetype, &$expectedDateTime, $retrievedDate
$dtoffset = $retrieved_date_time[0]." ".substr($retrieved_date_time[1], 0, -1)." ".$retrieved_date_time[2];
if ($dtoffset != $expectedDateTime[4] and
$dtoffset != $expectedDateTime[5] and
$dtoffset != $expectedDateTime[6]) {
$dtoffset != $expectedDateTime[6] and
$dtoffset != $expectedDateTime[7]) {echo "1: $dtoffset 2: $expectedDateTime[4] 3: $expectedDateTime[5] 4: $expectedDateTime[5]\n";
fatalError("Datetimeoffsets do not match!");
}
break;
@ -195,7 +196,8 @@ function CompareDateTimeObject($datetimetype, &$expectedDateTime, $retrievedDate
// datetimeoffset.
if ($retrievedDateTime != $expectedDateTime[4] and
$retrievedDateTime != $expectedDateTime[5] and
$retrievedDateTime != $expectedDateTime[6]) {
$retrievedDateTime != $expectedDateTime[6] and
$retrievedDateTime != $expectedDateTime[7]) {
fatalError("Datetimeoffsets do not match!");
}
break;
@ -373,6 +375,7 @@ $expectedDateTime = array($year."-".$month."-".$day." ".$hour.":".$minute.":".$s
$year."-".$month."-".$day." ".$hour.":".$minute.":".$second.".".$frac.$frac2." ".$tz_correction,
$year."-".$month."-".$day." ".$hour.":".$minute.":".$second.".".$frac."0000 ".$tz_correction,
$year."-".$month."-".$day." ".$hour.":".$minute.":".$second.".000000 ".$tz_correction,
$year."-".$month."-".$day." ".$hour.":".$minute.":00.000000 ".$tz_correction,
);
// These formats are for the ODBC driver with types specified in sqlsrv_prepare()