ResultSet: reads fraction of seconds to DateInterval (#197)

Possibility of fraction of seconds to be readable from database by ActiveRow interface was added. Appropriate preg_match in Database/ResultSet.php was adjusted and resulting DateInterval class instance filled with fraction of second (if any). Unit test with MySQL was altered accordingly.

Author: pospisilv

src/Database/ResultSet.php

@@ -153,8 +153,9 @@ public function normalizeRow(array $row): array
 				$row[$key] = new Nette\Utils\DateTime($value);
 
 			} elseif ($type === IStructure::FIELD_TIME_INTERVAL) {
-				preg_match('#^(-?)(\d+)\D(\d+)\D(\d+)\z#', $value, $m);
+				preg_match('#^(-?)(\d+)\D(\d+)\D(\d+)(\.\d+)?\z#', $value, $m);
 				$row[$key] = new \DateInterval("PT$m[2]H$m[3]M$m[4]S");
+				$row[$key]->f = isset($m[5]) ? (float) $m[5] : 0.0;
 				$row[$key]->invert = (int) (bool) $m[1];
 
 			} elseif ($type === IStructure::FIELD_UNIX_TIMESTAMP) {

tests/Database/ResultSet.normalizeRow.mysql.phpt

@@ -122,3 +122,13 @@ $res = $connection->query('SELECT `int` AS a, `char` AS a FROM types');
 Assert::same([
 	'a' => 'a',
 ], (array) @$res->fetch());
+
+
+$res = $connection->query('SELECT sec_to_time(avg(time_to_sec(`time`))) AS `avg_time` FROM `avgs`');
+
+$avgTime = new DateInterval('PT10H10M10S');
+$avgTime->f = 0.5;
+
+Assert::equal([
+	'avg_time' => $avgTime,
+], (array) $res->fetch());

tests/Database/files/mysql-nette_test3.sql

@@ -38,3 +38,11 @@ INSERT INTO `types` (`unsigned_int`, `int`, `smallint`, `tinyint`, `mediumint`,
 (1,	1,	1,	1,	1,	1,	1,	1,	1.1,	1,	1.1,	'2012-10-13',	'30:10:10',	'2012-10-13 10:10:10',	'2012-10-13 10:10:10',	'2012',	'a',	'a',	'a',	'a',	'a',	'a',	'a',	'a',	'a',	'a',	'a',	'a',	'a',	'a'),
 (0,	0,	0,	0,	0,	0,	0,	0,	0.5,	0.5,	0.5,	'0000-00-00',	'00:00:00',	'0000-00-00 00:00:00',	'0000-00-00 00:00:00',	'2000',	'',	'',	'\0',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'b',	''),
 (NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL);
+
+CREATE TEMPORARY TABLE `avgs` (
+  `time` time
+) ENGINE=InnoDB;
+
+INSERT INTO `avgs` (`time`) VALUES
+('10:10:11'),
+('10:10:10');