To configure this service as the default persistence service for openHAB, add or change the line
-```
+```ini
org.openhab.core.persistence:default=jdbc
```
services/jdbc.cfg
-```
+```ini
url=jdbc:postgresql://192.168.0.1:5432/testPostgresql
```
Your services/jdbc.cfg should contain the following minimal configuration for connecting to an Oracle Autonomous Database:
-```
+```ini
url=jdbc:oracle:thin:@dbname?TNS_ADMIN=./dbname_tns_admin_folder
user=openhab
password=openhab_password
services/jdbc.cfg
-```
+```ini
url=jdbc:mysql://192.168.0.1:3306/testMysql
user=test
password=test
public Long doCreateNewEntryInItemsTable(ItemsVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlCreateNewEntryInItemsTable,
new String[] { "#itemsManageTable#", "#itemname#" },
- new String[] { vo.getItemsManageTable(), vo.getItemName() });
+ new String[] { formattedIdentifier(vo.getItemsManageTable()), vo.getItemName() });
logger.debug("JDBC::doCreateNewEntryInItemsTable sql={}", sql);
try {
return Yank.insert(sql, null);
public ItemsVO doCreateItemsTableIfNot(ItemsVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlCreateItemsTableIfNot,
new String[] { "#itemsManageTable#", "#colname#", "#coltype#" },
- new String[] { vo.getItemsManageTable(), vo.getColname(), vo.getColtype() });
+ new String[] { formattedIdentifier(vo.getItemsManageTable()), vo.getColname(), vo.getColtype() });
logger.debug("JDBC::doCreateItemsTableIfNot sql={}", sql);
try {
Yank.execute(sql, null);
public ItemsVO doDropItemsTableIfExists(ItemsVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlDropItemsTableIfExists, new String[] { "#itemsManageTable#" },
- new String[] { vo.getItemsManageTable() });
+ new String[] { formattedIdentifier(vo.getItemsManageTable()) });
logger.debug("JDBC::doDropItemsTableIfExists sql={}", sql);
try {
Yank.execute(sql, null);
public void doDropTable(String tableName) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlDropTable, new String[] { "#tableName#" },
- new String[] { tableName });
+ new String[] { formattedIdentifier(tableName) });
logger.debug("JDBC::doDropTable sql={}", sql);
try {
Yank.execute(sql, null);
public void doDeleteItemsEntry(ItemsVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlDeleteItemsEntry,
new String[] { "#itemsManageTable#", "#itemname#" },
- new String[] { vo.getItemsManageTable(), vo.getItemName() });
+ new String[] { formattedIdentifier(vo.getItemsManageTable()), vo.getItemName() });
logger.debug("JDBC::doDeleteItemsEntry sql={}", sql);
try {
Yank.execute(sql, null);
public List<ItemsVO> doGetItemIDTableNames(ItemsVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlGetItemIDTableNames, new String[] { "#itemsManageTable#" },
- new String[] { vo.getItemsManageTable() });
+ new String[] { formattedIdentifier(vo.getItemsManageTable()) });
logger.debug("JDBC::doGetItemIDTableNames sql={}", sql);
try {
return Yank.queryBeanList(sql, ItemsVO.class, null);
public void doCreateItemTable(ItemVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlCreateItemTable,
- new String[] { "#tableName#", "#dbType#", "#tablePrimaryKey#" },
- new String[] { vo.getTableName(), vo.getDbType(), sqlTypes.get("tablePrimaryKey") });
+ new String[] { "#tableName#", "#dbType#", "#tablePrimaryKey#" }, new String[] {
+ formattedIdentifier(vo.getTableName()), vo.getDbType(), sqlTypes.get("tablePrimaryKey") });
logger.debug("JDBC::doCreateItemTable sql={}", sql);
try {
Yank.execute(sql, null);
public void doAlterTableColumn(String tableName, String columnName, String columnType, boolean nullable)
throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlAlterTableColumn,
- new String[] { "#tableName#", "#columnName#", "#columnType#" },
- new String[] { tableName, columnName, nullable ? columnType : columnType + " NOT NULL" });
+ new String[] { "#tableName#", "#columnName#", "#columnType#" }, new String[] {
+ formattedIdentifier(tableName), columnName, nullable ? columnType : columnType + " NOT NULL" });
logger.debug("JDBC::doAlterTableColumn sql={}", sql);
try {
Yank.execute(sql, null);
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), sqlTypes.get("tablePrimaryValue") });
+ new String[] { formattedIdentifier(storedVO.getTableName()), sqlTypes.get("tablePrimaryValue") });
Object[] params = { storedVO.getValue(), storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} value='{}'", sql, storedVO.getValue());
try {
public void doStoreItemValue(Item item, State itemState, ItemVO vo, ZonedDateTime date) throws JdbcSQLException {
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
- new String[] { "#tableName#", "#tablePrimaryValue#" }, new String[] { storedVO.getTableName(), "?" });
+ new String[] { "#tableName#", "#tablePrimaryValue#" },
+ new String[] { formattedIdentifier(storedVO.getTableName()), "?" });
java.sql.Timestamp timestamp = new java.sql.Timestamp(date.toInstant().toEpochMilli());
Object[] params = { timestamp, storedVO.getValue(), storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} timestamp={} value='{}'", sql, timestamp, storedVO.getValue());
public long doGetRowCount(String tableName) throws JdbcSQLException {
final String sql = StringUtilsExt.replaceArrayMerge(sqlGetRowCount, new String[] { "#tableName#" },
- new String[] { tableName });
+ new String[] { formattedIdentifier(tableName) });
logger.debug("JDBC::doGetRowCount sql={}", sql);
try {
final @Nullable Long result = Yank.queryScalar(sql, Long.class, null);
// SELECT time, ROUND(value,3) FROM number_item_0114 ORDER BY time DESC LIMIT 0,1
// rounding HALF UP
String queryString = "NUMBERITEM".equalsIgnoreCase(simpleName) && numberDecimalcount > -1
- ? "SELECT time, ROUND(value," + numberDecimalcount + ") FROM " + table
- : "SELECT time, value FROM " + table;
+ ? "SELECT time, ROUND(value," + numberDecimalcount + ") FROM " + formattedIdentifier(table)
+ : "SELECT time, value FROM " + formattedIdentifier(table);
if (!filterString.isEmpty()) {
queryString += filterString;
}
logger.debug("JDBC::histItemFilterDeleteProvider filter = {}, table = {}", filter, table);
String filterString = resolveTimeFilter(filter, timeZone);
- String deleteString = filterString.isEmpty() ? "TRUNCATE TABLE " + table
- : "DELETE FROM " + table + filterString;
+ String deleteString = filterString.isEmpty() ? "TRUNCATE TABLE " + formattedIdentifier(table)
+ : "DELETE FROM " + formattedIdentifier(table) + filterString;
logger.debug("JDBC::delete deleteString = {}", deleteString);
return deleteString;
}
}
private String updateItemTableNamesProvider(ItemVO itemTable) {
- String queryString = "ALTER TABLE " + itemTable.getTableName() + " RENAME TO " + itemTable.getNewTableName();
+ String newTableName = itemTable.getNewTableName();
+ if (newTableName == null) {
+ throw new IllegalArgumentException("New table name is not provided");
+ }
+ String queryString = "ALTER TABLE " + formattedIdentifier(itemTable.getTableName()) + " RENAME TO "
+ + formattedIdentifier(newTableName);
logger.debug("JDBC::query queryString = {}", queryString);
return queryString;
}
throw new UnsupportedOperationException("String of type '" + v.getClass().getName() + "' is not supported");
}
- public String getItemType(Item i) {
+ protected String formattedIdentifier(String identifier) {
+ return identifier;
+ }
+
+ private String getItemType(Item i) {
Item item = i;
String def = "STRINGITEM";
if (i instanceof GroupItem groupItem) {
import java.time.ZoneId;
import java.time.ZonedDateTime;
-import java.util.List;
import java.util.Objects;
-import java.util.stream.Collectors;
-
-import javax.measure.Quantity;
-import javax.measure.Unit;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.knowm.yank.Yank;
import org.knowm.yank.exceptions.YankSQLException;
import org.openhab.core.items.Item;
-import org.openhab.core.library.items.NumberItem;
import org.openhab.core.persistence.FilterCriteria;
import org.openhab.core.persistence.FilterCriteria.Ordering;
-import org.openhab.core.persistence.HistoricItem;
import org.openhab.core.types.State;
import org.openhab.persistence.jdbc.internal.dto.ItemVO;
import org.openhab.persistence.jdbc.internal.dto.ItemsVO;
-import org.openhab.persistence.jdbc.internal.dto.JdbcHistoricItem;
import org.openhab.persistence.jdbc.internal.exceptions.JdbcSQLException;
import org.openhab.persistence.jdbc.internal.utils.StringUtilsExt;
import org.slf4j.Logger;
@Override
public boolean doIfTableExists(ItemsVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlIfTableExists, new String[] { "#searchTable#" },
- new String[] { vo.getItemsManageTable().toUpperCase() });
+ new String[] { formattedIdentifier(vo.getItemsManageTable()) });
logger.debug("JDBC::doIfTableExists sql={}", sql);
try {
final @Nullable String result = Yank.queryScalar(sql, String.class, null);
}
}
- @Override
- public Long doCreateNewEntryInItemsTable(ItemsVO vo) throws JdbcSQLException {
- String sql = StringUtilsExt.replaceArrayMerge(sqlCreateNewEntryInItemsTable,
- new String[] { "#itemsManageTable#", "#itemname#" },
- new String[] { vo.getItemsManageTable().toUpperCase(), vo.getItemName() });
- logger.debug("JDBC::doCreateNewEntryInItemsTable sql={}", sql);
- try {
- return Yank.insert(sql, null);
- } catch (YankSQLException e) {
- throw new JdbcSQLException(e);
- }
- }
-
@Override
public ItemsVO doCreateItemsTableIfNot(ItemsVO vo) throws JdbcSQLException {
boolean tableExists = doIfTableExists(vo);
if (!tableExists) {
String sql = StringUtilsExt.replaceArrayMerge(sqlCreateItemsTableIfNot,
new String[] { "#itemsManageTable#", "#colname#", "#coltype#" },
- new String[] { vo.getItemsManageTable().toUpperCase(), vo.getColname(), vo.getColtype() });
+ new String[] { formattedIdentifier(vo.getItemsManageTable()), vo.getColname(), vo.getColtype() });
logger.debug("JDBC::doCreateItemsTableIfNot tableExists={} therefore sql={}", tableExists, sql);
try {
Yank.execute(sql, null);
/*************
* ITEM DAOs *
*************/
- @Override
- public void doCreateItemTable(ItemVO vo) throws JdbcSQLException {
- String sql = StringUtilsExt.replaceArrayMerge(sqlCreateItemTable,
- new String[] { "#tableName#", "#dbType#", "#tablePrimaryKey#" },
- new String[] { vo.getTableName(), vo.getDbType(), sqlTypes.get("tablePrimaryKey") });
- try {
- Yank.execute(sql, null);
- } catch (YankSQLException e) {
- throw new JdbcSQLException(e);
- }
- }
-
@Override
public void doStoreItemValue(Item item, State itemState, ItemVO vo) throws JdbcSQLException {
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName().toUpperCase(), storedVO.getDbType(),
+ new String[] { formattedIdentifier(storedVO.getTableName()), storedVO.getDbType(),
sqlTypes.get("tablePrimaryValue") });
Object[] params = { storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} value='{}'", sql, storedVO.getValue());
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName().toUpperCase(), storedVO.getDbType(), "?" });
+ 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());
}
}
- @Override
- public List<HistoricItem> doGetHistItemFilterQuery(Item item, FilterCriteria filter, int numberDecimalcount,
- String table, String name, ZoneId timeZone) throws JdbcSQLException {
- String sql = histItemFilterQueryProvider(filter, numberDecimalcount, table, name, timeZone);
- List<Object[]> m;
- try {
- m = Yank.queryObjectArrays(sql, null);
- } catch (YankSQLException e) {
- throw new JdbcSQLException(e);
- }
- logger.debug("JDBC::doGetHistItemFilterQuery got Array length={}", m.size());
- // we already retrieve the unit here once as it is a very costly operation
- String itemName = item.getName();
- Unit<? extends Quantity<?>> unit = item instanceof NumberItem ni ? ni.getUnit() : null;
- return m.stream().map(o -> {
- logger.debug("JDBC::doGetHistItemFilterQuery 0='{}' 1='{}'", o[0], o[1]);
- return new JdbcHistoricItem(itemName, objectAsState(item, unit, o[1]), objectAsZonedDateTime(o[0]));
- }).collect(Collectors.<HistoricItem> toList());
- }
-
/****************************
* SQL generation Providers *
****************************/
queryString += "5 AS DECIMAL(31," + numberDecimalcount + "))"; // 31 is DECIMAL max precision
// https://db.apache.org/derby/docs/10.0/manuals/develop/develop151.html
} else {
- queryString += " value FROM " + table.toUpperCase();
+ queryString += " value FROM " + formattedIdentifier(table);
}
if (!filterString.isEmpty()) {
/*****************
* H E L P E R S *
*****************/
+ @Override
+ protected String formattedIdentifier(String identifier) {
+ return identifier.toUpperCase();
+ }
/******************************
* public Getters and Setters *
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), storedVO.getDbType(), sqlTypes.get("tablePrimaryValue") });
+ new String[] { formattedIdentifier(storedVO.getTableName()), storedVO.getDbType(),
+ sqlTypes.get("tablePrimaryValue") });
Object[] params = { storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} value='{}'", sql, storedVO.getValue());
try {
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), storedVO.getDbType(), "?" });
+ 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());
import org.openhab.core.items.Item;
import org.openhab.core.types.State;
import org.openhab.persistence.jdbc.internal.dto.ItemVO;
-import org.openhab.persistence.jdbc.internal.dto.ItemsVO;
import org.openhab.persistence.jdbc.internal.exceptions.JdbcSQLException;
import org.openhab.persistence.jdbc.internal.utils.StringUtilsExt;
import org.slf4j.Logger;
}
}
- @Override
- public ItemsVO doCreateItemsTableIfNot(ItemsVO vo) throws JdbcSQLException {
- String sql = StringUtilsExt.replaceArrayMerge(sqlCreateItemsTableIfNot,
- new String[] { "#itemsManageTable#", "#colname#", "#coltype#", "#itemsManageTable#" },
- new String[] { vo.getItemsManageTable(), vo.getColname(), vo.getColtype(), vo.getItemsManageTable() });
- logger.debug("JDBC::doCreateItemsTableIfNot sql={}", sql);
- try {
- Yank.execute(sql, null);
- } catch (YankSQLException e) {
- throw new JdbcSQLException(e);
- }
- return vo;
- }
-
- @Override
- public Long doCreateNewEntryInItemsTable(ItemsVO vo) throws JdbcSQLException {
- String sql = StringUtilsExt.replaceArrayMerge(sqlCreateNewEntryInItemsTable,
- new String[] { "#itemsManageTable#", "#itemname#" },
- new String[] { vo.getItemsManageTable(), vo.getItemName() });
- logger.debug("JDBC::doCreateNewEntryInItemsTable sql={}", sql);
- try {
- return Yank.insert(sql, null);
- } catch (YankSQLException e) {
- throw new JdbcSQLException(e);
- }
- }
-
/*************
* ITEM DAOs *
*************/
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tableName#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), storedVO.getDbType(), storedVO.getTableName(),
- sqlTypes.get("tablePrimaryValue") });
+ new String[] { formattedIdentifier(storedVO.getTableName()), storedVO.getDbType(),
+ storedVO.getTableName(), sqlTypes.get("tablePrimaryValue") });
Object[] params = { storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} value='{}'", sql, storedVO.getValue());
try {
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tableName#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), storedVO.getDbType(), storedVO.getTableName(), "?" });
+ new String[] { formattedIdentifier(storedVO.getTableName()), storedVO.getDbType(),
+ storedVO.getTableName(), "?" });
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());
throw new JdbcSQLException(e);
}
// We need to return the itemId, but Yank.insert does not retrieve the value from Oracle. So do an explicit
- // query
- // for it.
+ // query for it.
sql = StringUtilsExt.replaceArrayMerge(sqlGetItemTableID, new String[] { "#itemsManageTable#", "#colname#" },
new String[] { vo.getItemsManageTable(), vo.getColname() });
logger.debug("JDBC::doGetEntryIdInItemsTable sql={}", sql);
logger.debug("JDBC::initSqlQueries: '{}'", this.getClass().getSimpleName());
// System Information Functions: https://www.postgresql.org/docs/9.2/static/functions-info.html
sqlGetDB = "SELECT CURRENT_DATABASE()";
- sqlIfTableExists = "SELECT * FROM PG_TABLES WHERE TABLENAME='\"#searchTable#\"'";
- sqlDropTable = "DROP TABLE \"#tableName#\"";
- sqlCreateItemsTableIfNot = "CREATE TABLE IF NOT EXISTS \"#itemsManageTable#\" (itemid SERIAL NOT NULL, #colname# #coltype# NOT NULL, CONSTRAINT #itemsManageTable#_pkey PRIMARY KEY (itemid))";
- sqlCreateNewEntryInItemsTable = "INSERT INTO items (itemname) SELECT itemname FROM \"#itemsManageTable#\" UNION VALUES ('#itemname#') EXCEPT SELECT itemname FROM items";
+ sqlIfTableExists = "SELECT * FROM PG_TABLES WHERE TABLENAME='#searchTable#'";
+ sqlCreateItemsTableIfNot = "CREATE TABLE IF NOT EXISTS #itemsManageTable# (itemid SERIAL NOT NULL, #colname# #coltype# NOT NULL, CONSTRAINT #tablePrimaryKey# PRIMARY KEY (itemid))";
+ sqlCreateNewEntryInItemsTable = "INSERT INTO items (itemname) SELECT itemname FROM #itemsManageTable# UNION VALUES ('#itemname#') EXCEPT SELECT itemname FROM items";
sqlGetItemTables = """
SELECT table_name FROM information_schema.tables WHERE table_type='BASE TABLE' AND table_schema=(SELECT table_schema \
- FROM information_schema.tables WHERE table_type='BASE TABLE' AND table_name='\"#itemsManageTable#\"') AND NOT table_name='\"#itemsManageTable#\"'\
+ FROM information_schema.tables WHERE table_type='BASE TABLE' AND table_name='#itemsManageTable#') AND NOT table_name='#itemsManageTable#'\
""";
// The PostgreSQL equivalent to MySQL columns.column_type is data_type (e.g. "timestamp with time zone") and
// udt_name which contains a shorter alias (e.g. "timestamptz"). We alias data_type as "column_type" and
// udt_name as "column_type_alias" to be compatible with the 'Column' class used in Yank.queryBeanList
sqlGetTableColumnTypes = """
SELECT column_name, data_type as column_type, udt_name as column_type_alias, is_nullable FROM information_schema.columns \
- WHERE table_name='\"#tableName#\"' AND table_catalog='#jdbcUriDatabaseName#' AND table_schema=(SELECT table_schema FROM information_schema.tables WHERE table_type='BASE TABLE' \
- AND table_name='\"#itemsManageTable#\"')\
+ WHERE table_name='#tableName#' AND table_catalog='#jdbcUriDatabaseName#' AND table_schema=(SELECT table_schema FROM information_schema.tables WHERE table_type='BASE TABLE' \
+ AND table_name='#itemsManageTable#')\
""";
// NOTICE: on PostgreSql >= 9.5, sqlInsertItemValue query template is modified to do an "upsert" (overwrite
// existing value). The version check and query change is performed at initAfterFirstDbConnection()
- sqlInsertItemValue = "INSERT INTO \"#tableName#\" (TIME, VALUE) VALUES( #tablePrimaryValue#, CAST( ? as #dbType#) )";
- sqlCreateItemTable = "CREATE TABLE IF NOT EXISTS \"#tableName#\" (time #tablePrimaryKey# NOT NULL, value #dbType#, PRIMARY KEY(time))";
- sqlAlterTableColumn = "ALTER TABLE \"#tableName#\" ALTER COLUMN #columnName# TYPE #columnType#";
- sqlGetRowCount = "SELECT COUNT(*) FROM \"#tableName#\"";
+ sqlInsertItemValue = "INSERT INTO #tableName# (TIME, VALUE) VALUES( #tablePrimaryValue#, CAST( ? as #dbType#) )";
+ sqlAlterTableColumn = "ALTER TABLE #tableName# ALTER COLUMN #columnName# TYPE #columnType#";
}
@Override
if (dbMeta.isDbVersionGreater(9, 4)) {
logger.debug("JDBC::initAfterFirstDbConnection: Values with the same time will be upserted (Pg >= 9.5)");
sqlInsertItemValue = """
- INSERT INTO \"#tableName#\" (TIME, VALUE) VALUES( #tablePrimaryValue#, CAST( ? as #dbType#) )\
+ INSERT INTO #tableName# (TIME, VALUE) VALUES( #tablePrimaryValue#, CAST( ? as #dbType#) )\
ON CONFLICT (TIME) DO UPDATE SET VALUE=EXCLUDED.VALUE\
""";
}
@Override
public ItemsVO doCreateItemsTableIfNot(ItemsVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlCreateItemsTableIfNot,
- new String[] { "#itemsManageTable#", "#colname#", "#coltype#", "#itemsManageTable#" },
- new String[] { vo.getItemsManageTable(), vo.getColname(), vo.getColtype(), vo.getItemsManageTable() });
+ new String[] { "#itemsManageTable#", "#colname#", "#coltype#", "#tablePrimaryKey#" },
+ new String[] { formattedIdentifier(vo.getItemsManageTable()), vo.getColname(), vo.getColtype(),
+ vo.getItemsManageTable() + "_pkey" });
logger.debug("JDBC::doCreateItemsTableIfNot sql={}", sql);
try {
Yank.execute(sql, null);
return vo;
}
- @Override
- public Long doCreateNewEntryInItemsTable(ItemsVO vo) throws JdbcSQLException {
- String sql = StringUtilsExt.replaceArrayMerge(sqlCreateNewEntryInItemsTable,
- new String[] { "#itemsManageTable#", "#itemname#" },
- new String[] { vo.getItemsManageTable(), vo.getItemName() });
- logger.debug("JDBC::doCreateNewEntryInItemsTable sql={}", sql);
- try {
- return Yank.insert(sql, null);
- } catch (YankSQLException e) {
- throw new JdbcSQLException(e);
- }
- }
-
@Override
public List<ItemsVO> doGetItemTables(ItemsVO vo) throws JdbcSQLException {
- String sql = StringUtilsExt.replaceArrayMerge(this.sqlGetItemTables,
+ String sql = StringUtilsExt.replaceArrayMerge(sqlGetItemTables,
new String[] { "#itemsManageTable#", "#itemsManageTable#" },
new String[] { vo.getItemsManageTable(), vo.getItemsManageTable() });
- this.logger.debug("JDBC::doGetItemTables sql={}", sql);
+ logger.debug("JDBC::doGetItemTables sql={}", sql);
try {
return Yank.queryBeanList(sql, ItemsVO.class, null);
} catch (YankSQLException e) {
throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlAlterTableColumn,
new String[] { "#tableName#", "#columnName#", "#columnType#" },
- new String[] { tableName, columnName, columnType });
- logger.info("JDBC::doAlterTableColumn sql={}", sql);
+ new String[] { formattedIdentifier(tableName), columnName, columnType });
+ logger.debug("JDBC::doAlterTableColumn sql={}", sql);
try {
Yank.execute(sql, null);
if (!nullable) {
String sql2 = StringUtilsExt.replaceArrayMerge(
- "ALTER TABLE \"#tableName#\" ALTER COLUMN #columnName# SET NOT NULL",
- new String[] { "#tableName#", "#columnName#" }, new String[] { tableName, columnName });
- logger.info("JDBC::doAlterTableColumn sql={}", sql2);
+ "ALTER TABLE #tableName# ALTER COLUMN #columnName# SET NOT NULL",
+ new String[] { "#tableName#", "#columnName#" },
+ new String[] { formattedIdentifier(tableName), columnName });
+ logger.debug("JDBC::doAlterTableColumn sql={}", sql2);
Yank.execute(sql2, null);
}
} catch (YankSQLException e) {
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), storedVO.getDbType(), sqlTypes.get("tablePrimaryValue") });
+ new String[] { formattedIdentifier(storedVO.getTableName()), storedVO.getDbType(),
+ sqlTypes.get("tablePrimaryValue") });
Object[] params = { storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} value='{}'", sql, storedVO.getValue());
try {
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), storedVO.getDbType(), "?" });
+ 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());
+ filter.getPageSize();
}
String queryString = "NUMBERITEM".equalsIgnoreCase(simpleName) && numberDecimalcount > -1
- ? "SELECT time, ROUND(CAST (value AS numeric)," + numberDecimalcount + ") FROM " + table
- : "SELECT time, value FROM " + table;
+ ? "SELECT time, ROUND(CAST (value AS numeric)," + numberDecimalcount + ") FROM "
+ + formattedIdentifier(table)
+ : "SELECT time, value FROM " + formattedIdentifier(table);
if (!filterString.isEmpty()) {
queryString += filterString;
}
/*****************
* H E L P E R S *
*****************/
+ @Override
+ protected String formattedIdentifier(String identifier) {
+ return "\"" + identifier + "\"";
+ }
/******************************
* public Getters and Setters *
public ItemsVO doCreateItemsTableIfNot(ItemsVO vo) throws JdbcSQLException {
String sql = StringUtilsExt.replaceArrayMerge(sqlCreateItemsTableIfNot,
new String[] { "#itemsManageTable#", "#colname#", "#coltype#" },
- new String[] { vo.getItemsManageTable(), vo.getColname(), vo.getColtype() });
+ new String[] { formattedIdentifier(vo.getItemsManageTable()), vo.getColname(), vo.getColtype() });
logger.debug("JDBC::doCreateItemsTableIfNot sql={}", sql);
try {
Yank.execute(sql, null);
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), storedVO.getDbType(), sqlTypes.get("tablePrimaryValue") });
+ new String[] { formattedIdentifier(storedVO.getTableName()), storedVO.getDbType(),
+ sqlTypes.get("tablePrimaryValue") });
Object[] params = { storedVO.getValue() };
logger.debug("JDBC::doStoreItemValue sql={} value='{}'", sql, storedVO.getValue());
try {
ItemVO storedVO = storeItemValueProvider(item, itemState, vo);
String sql = StringUtilsExt.replaceArrayMerge(sqlInsertItemValue,
new String[] { "#tableName#", "#dbType#", "#tablePrimaryValue#" },
- new String[] { storedVO.getTableName(), storedVO.getDbType(), "?" });
+ 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());
public class JdbcTimescaledbDAO extends JdbcPostgresqlDAO {
private final Logger logger = LoggerFactory.getLogger(JdbcTimescaledbDAO.class);
- private final String sqlCreateHypertable = "SELECT created FROM create_hypertable('\"#tableName#\"', 'time')";
- private final String sqlGetItemTables = "SELECT hypertable_name as table_name FROM timescaledb_information.hypertables WHERE hypertable_name != '\"#itemsManageTable#\"'";
+ private final String sqlCreateHypertable = "SELECT created FROM create_hypertable('#tableName#', 'time')";
+ private final String sqlGetItemTables = "SELECT hypertable_name AS table_name FROM timescaledb_information.hypertables WHERE hypertable_name != '#itemsManageTable#'";
@Override
public Properties getConnectionProperties() {
public void doCreateItemTable(ItemVO vo) throws JdbcSQLException {
super.doCreateItemTable(vo);
String sql = StringUtilsExt.replaceArrayMerge(this.sqlCreateHypertable, new String[] { "#tableName#" },
- new String[] { vo.getTableName() });
+ new String[] { formattedIdentifier(vo.getTableName()) });
this.logger.debug("JDBC::doCreateItemTable sql={}", sql);
try {
Yank.queryScalar(sql, Boolean.class, null);
projects / openhab-addons.git / commitdiff