Skip to content

[jdbc] SQLite: Fix format when persisting item with timestamp #18407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 14, 2025
+10 −5
Merged

[jdbc] SQLite: Fix format when persisting item with timestamp #18407

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a34754
[jdbc]: Fix insert time value when using persist
lovery Mar 17, 2025
87055a4
[jdbc]: Use strftime and substr for parsing
lovery May 12, 2025
d71e18a
[jdbc]: Remove extra empty line
lovery May 12, 2025
fe0bb2e
[jdbc]: Replace the substr with methods
lovery May 13, 2025
f72c06a
[jdbc]: Use same formarted
lovery May 14, 2025
5dcdd02
[jdbc]: Remove tablePrimaryValueFormated from sqlTypes
lovery May 14, 2025
4f7ad2e
[jdbc]: Complying with the naming convention
lovery May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ...ersistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcSqliteDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
package org.openhab.persistence.jdbc.internal.db;

import java.time.ZonedDateTime;
import java.time.temporal.ChronoField;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
Expand Down Expand Up @@ -67,6 +68,8 @@ private void initSqlQueries() {
private void initSqlTypes() {
logger.debug("JDBC::initSqlTypes: Initialize the type array");
sqlTypes.put("tablePrimaryValue", "strftime('%Y-%m-%d %H:%M:%f' , 'now' , 'localtime')");
sqlTypes.put("tablePrimaryValueFormated",
"strftime('%Y-%m-%d %H:%M:%S' , ?, 'unixepoch', 'localtime') || '.' || ?");
}

/**
Expand Down Expand Up @@ -130,10 +133,15 @@ public void doStoreItemValue(Item item, State itemState, ItemVO vo, ZonedDateTim
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
new String[] { formattedIdentifier(storedVO.getTableName()), storedVO.getDbType(), "?" });
java.sql.Timestamp timestamp = new java.sql.Timestamp(date.toInstant().toEpochMilli());
Object[] params = { timestamp, storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} timestamp={} value='{}'", sql, timestamp, storedVO.getValue());
new String[] { formattedIdentifier(storedVO.getTableName()), storedVO.getDbType(),
sqlTypes.get("tablePrimaryValueFormated") });

java.time.Instant dateInstant = date.toInstant();
long epochSecond = dateInstant.getEpochSecond();
int millis = dateInstant.get(ChronoField.MILLI_OF_SECOND);
Object[] params = { epochSecond, millis, storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} seconds={} millis={} value='{}'", sql, epochSecond, millis,
storedVO.getValue());
try {
Yank.execute(sql, params);
} catch (YankSQLException e) {
Expand Down