Add support for milliseconds in parsed datetimes (fix #2727)

Bionus · Jun 24, 2022 · 0ea5327 · 0ea5327
1 parent 95b2c04
commit 0ea5327
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/lib/src/functions.cpp b/src/lib/src/functions.cpp
@@ -281,9 +281,18 @@ QDateTime qDateTimeFromString(const QString &str)
 {
 	QDateTime date;
 
+	// UTC timestamp
 	const uint toInt = str.toUInt();
 	if (toInt != 0) {
-		date = QDateTime::fromSecsSinceEpoch(toInt, Qt::UTC);
+		return QDateTime::fromSecsSinceEpoch(toInt, Qt::UTC);
+	}
+
+	if ((str.length() == 23 || str.length() == 26) && str[19] == '.') {
+		date = QDateTime::fromString(str.left(23), QStringLiteral("yyyy/MM/dd HH:mm:ss.zzz"));
+		if (!date.isValid()) {
+			date = QDateTime::fromString(str.left(23), QStringLiteral("yyyy-MM-dd HH:mm:ss.zzz"));
+		}
+		date.setTimeSpec(Qt::UTC);
 	} else if (str.length() == 19) {
 		date = QDateTime::fromString(str, QStringLiteral("yyyy/MM/dd HH:mm:ss"));
 		if (!date.isValid()) {

diff --git a/src/tests/src/functions-test.cpp b/src/tests/src/functions-test.cpp
@@ -287,6 +287,10 @@ TEST_CASE("Functions")
 		REQUIRE(qDateTimeFromString("1492192180").toUTC() == QDateTime(QDate(2017, 4, 14), QTime(17, 49, 40), Qt::UTC));
 
 		// Standart dates
+		REQUIRE(qDateTimeFromString("2017/04/14 17:49:40.123456").toUTC() == QDateTime(QDate(2017, 4, 14), QTime(17, 49, 40, 123), Qt::UTC));
+		REQUIRE(qDateTimeFromString("2017-04-14 17:49:40.123456").toUTC() == QDateTime(QDate(2017, 4, 14), QTime(17, 49, 40, 123), Qt::UTC));
+		REQUIRE(qDateTimeFromString("2017/04/14 17:49:40.123").toUTC() == QDateTime(QDate(2017, 4, 14), QTime(17, 49, 40, 123), Qt::UTC));
+		REQUIRE(qDateTimeFromString("2017-04-14 17:49:40.123").toUTC() == QDateTime(QDate(2017, 4, 14), QTime(17, 49, 40, 123), Qt::UTC));
 		REQUIRE(qDateTimeFromString("2017/04/14 17:49:40").toUTC() == QDateTime(QDate(2017, 4, 14), QTime(17, 49, 40), Qt::UTC));
 		REQUIRE(qDateTimeFromString("2017-04-14 17:49:40").toUTC() == QDateTime(QDate(2017, 4, 14), QTime(17, 49, 40), Qt::UTC));
 		REQUIRE(qDateTimeFromString("2017/04/14 17:49").toUTC() == QDateTime(QDate(2017, 4, 14), QTime(17, 49), Qt::UTC));