From 05f9a544420857b8328bc0edb9452047dfa03c10 Mon Sep 17 00:00:00 2001 From: v-susanh Date: Wed, 6 Dec 2017 11:16:17 -0800 Subject: [PATCH] updated data to avoid roundoff in php 7.1 and earlier versions (#620) --- test/functional/sqlsrv/AEData.inc | 8 ++++---- test/functional/sqlsrv/sqlsrv_ae_insert_datetime.phpt | 4 ++-- .../sqlsrv/sqlsrv_ae_insert_retrieve_fixed_size.phpt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/functional/sqlsrv/AEData.inc b/test/functional/sqlsrv/AEData.inc index bea885c3..eebf1f45 100644 --- a/test/functional/sqlsrv/AEData.inc +++ b/test/functional/sqlsrv/AEData.inc @@ -16,11 +16,11 @@ $real_params = array( 0, -2147.483, 2147.483, 1610, 1073, -1073 ); // date and time $date_params = array( '1900-01-01', '0001-01-01', '9999-12-31', '5000-07-15', '2500-04-08', '7500-10-23' ); -$datetime2_params = array( '1900-01-01 00:00:00', '0001-01-01 00:00:00', '9999-12-31 23:59:59.9999999', '5000-07-15 12:30:30.5555', '2500-04-08 06:15:15.33', '7500-10-23 18:45:45.888888' ); +$datetime2_params = array( '1900-01-01 00:00:00', '0001-01-01 00:00:00', '9999-12-31 23:59:59.123456', '5000-07-15 12:30:30.5555', '2500-04-08 06:15:15.33', '7500-10-23 18:45:45.888888' ); $datetime_params = array( '1900-01-01 00:00:00', '1753-01-01 00:00:00', '9999-12-31 23:59:59.997', '5000-07-15 12:30:30.5', '2500-04-08 06:15:15.33', '7500-10-23 18:45:45.888' ); -$datetimeoffset_params = array( '1900-01-01 00:00:00 +01:00', '0001-01-01 00:00:00 -14:00', '9999-12-31 23:59:59.9999999 +14:00', '5000-07-15 12:30:30.55 -03:00', '2500-04-08 06:15:15.3333 -07:00', '7500-10-23 18:45:45.888888 +07:00' ); +$datetimeoffset_params = array( '1900-01-01 00:00:00 +01:00', '0001-01-01 00:00:00 -14:00', '9999-12-31 23:59:59.123456+14:00', '5000-07-15 12:30:30.55 -03:00', '2500-04-08 06:15:15.3333 -07:00', '7500-10-23 18:45:45.888888 +07:00' ); $smalldatetime_params = array( '1900-01-01 00:00:00', '1900-01-01 00:00:00', '2079-06-05 23:59:00', '1990-07-15 12:30:00', '1945-04-08 06:15:00', '2000-10-23 18:45:00' ); -$time_params = array( '00:00:00', '00:00:00.0000000', '23:59:59.9999999', '12:30:30.5555', '06:15:15.33', '18:45:45.888888' ); +$time_params = array( '00:00:00', '00:00:00.0000000', '23:59:59.123456', '12:30:30.5555', '06:15:15.33', '18:45:45.888888' ); // character strings $char_params = array( 'Fixed', '-leng', 'th, n', 'on-Un', 'icode', 'strin' ); @@ -110,4 +110,4 @@ function get_default_size_prec( $sqlType ) return $sqlType; } -?> \ No newline at end of file +?> diff --git a/test/functional/sqlsrv/sqlsrv_ae_insert_datetime.phpt b/test/functional/sqlsrv/sqlsrv_ae_insert_datetime.phpt index 2db56343..6b85cf8f 100644 --- a/test/functional/sqlsrv/sqlsrv_ae_insert_datetime.phpt +++ b/test/functional/sqlsrv/sqlsrv_ae_insert_datetime.phpt @@ -78,7 +78,7 @@ c_det: timezone_type: 3 timezone: Canada/Pacific c_rand: - date: 9999-12-31 23:59:59.1000000 + date: 9999-12-31 23:59:59.123456 timezone_type: 3 timezone: Canada/Pacific @@ -105,6 +105,6 @@ c_det: timezone_type: 1 timezone: -14:00 c_rand: - date: 9999-12-31 23:59:59.1000000 + date: 9999-12-31 23:59:59.123456 timezone_type: 1 timezone: +14:00 diff --git a/test/functional/sqlsrv/sqlsrv_ae_insert_retrieve_fixed_size.phpt b/test/functional/sqlsrv/sqlsrv_ae_insert_retrieve_fixed_size.phpt index e9f9f212..22c7a4d2 100644 --- a/test/functional/sqlsrv/sqlsrv_ae_insert_retrieve_fixed_size.phpt +++ b/test/functional/sqlsrv/sqlsrv_ae_insert_retrieve_fixed_size.phpt @@ -30,7 +30,7 @@ $inputs = array( "TinyIntData" => 255, "DecimalData" => 79228162514264, "BitData" => 1, "DateTimeData" => '9999-12-31 23:59:59.997', - "DateTime2Data" => '9999-12-31 23:59:59.9999999'); + "DateTime2Data" => '9999-12-31 23:59:59.123456'); $r; $stmt = AE\insertRow($conn, $tbname, $inputs, $r); if ($r === false) { @@ -80,7 +80,7 @@ DateTimeData: timezone_type: 3 timezone: Canada/Pacific DateTime2Data: - date: 9999-12-31 23:59:59.1000000 + date: 9999-12-31 23:59:59.123456 timezone_type: 3 timezone: Canada/Pacific Done