demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-26 15:21:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[jdbc] Increased size of column type for Location Item (#10542)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2021-04-24 12:39:05 +02:00 committed by GitHub
parent 8acf6e6829
commit 0c390ab9c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.persistence.jdbc/README.md
View File

@ -48,8 +48,10 @@ This service can be configured in the file `services/jdbc.cfg`.
| sqltype.CONTACT | `VARCHAR(6)` | No | see above | | sqltype.CONTACT | `VARCHAR(6)` | No | see above |
| sqltype.DATETIME | `DATETIME` | No | see above | | sqltype.DATETIME | `DATETIME` | No | see above |
| sqltype.DIMMER | `TINYINT` | No | see above | | sqltype.DIMMER | `TINYINT` | No | see above |
| sqltype.LOCATION | `VARCHAR(30)` | No | see above | | sqltype.IMAGE | `VARCHAR(65500)` | No | see above |
| sqltype.LOCATION | `VARCHAR(50)` | No | see above |
| sqltype.NUMBER | `DOUBLE` | No | see above | | sqltype.NUMBER | `DOUBLE` | No | see above |
| sqltype.PLAYER | `VARCHAR(20)` | No | see above |
| sqltype.ROLLERSHUTTER | `TINYINT` | No | see above | | sqltype.ROLLERSHUTTER | `TINYINT` | No | see above |
| sqltype.STRING | `VARCHAR(65500)` | No | see above | | sqltype.STRING | `VARCHAR(65500)` | No | see above |
| sqltype.SWITCH | `VARCHAR(6)` | No | see above | | sqltype.SWITCH | `VARCHAR(6)` | No | see above |

8
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java
View File

@ -50,9 +50,9 @@ import org.openhab.core.persistence.FilterCriteria.Ordering;
import org.openhab.core.persistence.HistoricItem; import org.openhab.core.persistence.HistoricItem;
import org.openhab.core.types.State; import org.openhab.core.types.State;
import org.openhab.core.types.TypeParser; import org.openhab.core.types.TypeParser;
import org.openhab.persistence.jdbc.model.ItemVO; import org.openhab.persistence.jdbc.dto.ItemVO;
import org.openhab.persistence.jdbc.model.ItemsVO; import org.openhab.persistence.jdbc.dto.ItemsVO;
import org.openhab.persistence.jdbc.model.JdbcHistoricItem; import org.openhab.persistence.jdbc.dto.JdbcHistoricItem;
import org.openhab.persistence.jdbc.utils.DbMetaData; import org.openhab.persistence.jdbc.utils.DbMetaData;
import org.openhab.persistence.jdbc.utils.StringUtilsExt; import org.openhab.persistence.jdbc.utils.StringUtilsExt;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -155,7 +155,7 @@ public class JdbcBaseDAO {
sqlTypes.put("DATETIMEITEM", "TIMESTAMP"); sqlTypes.put("DATETIMEITEM", "TIMESTAMP");
sqlTypes.put("DIMMERITEM", "TINYINT"); sqlTypes.put("DIMMERITEM", "TINYINT");
sqlTypes.put("IMAGEITEM", "VARCHAR(65500)");// jdbc max 21845 sqlTypes.put("IMAGEITEM", "VARCHAR(65500)");// jdbc max 21845
sqlTypes.put("LOCATIONITEM", "VARCHAR(30)"); sqlTypes.put("LOCATIONITEM", "VARCHAR(50)");
sqlTypes.put("NUMBERITEM", "DOUBLE"); sqlTypes.put("NUMBERITEM", "DOUBLE");
sqlTypes.put("PLAYERITEM", "VARCHAR(20)"); sqlTypes.put("PLAYERITEM", "VARCHAR(20)");
sqlTypes.put("ROLLERSHUTTERITEM", "TINYINT"); sqlTypes.put("ROLLERSHUTTERITEM", "TINYINT");

6
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcDerbyDAO.java
View File

@ -25,9 +25,9 @@ import org.openhab.core.library.items.NumberItem;
import org.openhab.core.persistence.FilterCriteria; import org.openhab.core.persistence.FilterCriteria;
import org.openhab.core.persistence.FilterCriteria.Ordering; import org.openhab.core.persistence.FilterCriteria.Ordering;
import org.openhab.core.persistence.HistoricItem; import org.openhab.core.persistence.HistoricItem;
import org.openhab.persistence.jdbc.model.ItemVO; import org.openhab.persistence.jdbc.dto.ItemVO;
import org.openhab.persistence.jdbc.model.ItemsVO; import org.openhab.persistence.jdbc.dto.ItemsVO;
import org.openhab.persistence.jdbc.model.JdbcHistoricItem; import org.openhab.persistence.jdbc.dto.JdbcHistoricItem;
import org.openhab.persistence.jdbc.utils.StringUtilsExt; import org.openhab.persistence.jdbc.utils.StringUtilsExt;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcH2DAO.java
View File

@ -14,7 +14,7 @@ package org.openhab.persistence.jdbc.db;
import org.knowm.yank.Yank; import org.knowm.yank.Yank;
import org.openhab.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.persistence.jdbc.model.ItemVO; import org.openhab.persistence.jdbc.dto.ItemVO;
import org.openhab.persistence.jdbc.utils.StringUtilsExt; import org.openhab.persistence.jdbc.utils.StringUtilsExt;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcHsqldbDAO.java
View File

@ -14,8 +14,8 @@ package org.openhab.persistence.jdbc.db;
import org.knowm.yank.Yank; import org.knowm.yank.Yank;
import org.openhab.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.persistence.jdbc.model.ItemVO; import org.openhab.persistence.jdbc.dto.ItemVO;
import org.openhab.persistence.jdbc.model.ItemsVO; import org.openhab.persistence.jdbc.dto.ItemsVO;
import org.openhab.persistence.jdbc.utils.StringUtilsExt; import org.openhab.persistence.jdbc.utils.StringUtilsExt;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcPostgresqlDAO.java
View File

@ -19,8 +19,8 @@ import org.knowm.yank.Yank;
import org.openhab.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.core.persistence.FilterCriteria; import org.openhab.core.persistence.FilterCriteria;
import org.openhab.core.persistence.FilterCriteria.Ordering; import org.openhab.core.persistence.FilterCriteria.Ordering;
import org.openhab.persistence.jdbc.model.ItemVO; import org.openhab.persistence.jdbc.dto.ItemVO;
import org.openhab.persistence.jdbc.model.ItemsVO; import org.openhab.persistence.jdbc.dto.ItemsVO;
import org.openhab.persistence.jdbc.utils.StringUtilsExt; import org.openhab.persistence.jdbc.utils.StringUtilsExt;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcSqliteDAO.java
View File

@ -14,8 +14,8 @@ package org.openhab.persistence.jdbc.db;
import org.knowm.yank.Yank; import org.knowm.yank.Yank;
import org.openhab.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.persistence.jdbc.model.ItemVO; import org.openhab.persistence.jdbc.dto.ItemVO;
import org.openhab.persistence.jdbc.model.ItemsVO; import org.openhab.persistence.jdbc.dto.ItemsVO;
import org.openhab.persistence.jdbc.utils.StringUtilsExt; import org.openhab.persistence.jdbc.utils.StringUtilsExt;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

7
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/model/ItemVO.java → bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/dto/ItemVO.java
View File

@ -10,7 +10,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.openhab.persistence.jdbc.model; package org.openhab.persistence.jdbc.dto;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@ -140,10 +140,7 @@ public class ItemVO implements Serializable {
} else if (!value.equals(other.value)) { } else if (!value.equals(other.value)) {
return false; return false;
} }
if (time != other.time) { return time == other.time;
return false;
}
return true;
} }
@Override @Override

7
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/model/ItemsVO.java → bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/dto/ItemsVO.java
View File

@ -10,7 +10,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.openhab.persistence.jdbc.model; package org.openhab.persistence.jdbc.dto;
import java.io.Serializable; import java.io.Serializable;
@ -127,10 +127,7 @@ public class ItemsVO implements Serializable {
} else if (!itemname.equals(other.itemname)) { } else if (!itemname.equals(other.itemname)) {
return false; return false;
} }
if (itemid != other.itemid) { return itemid == other.itemid;
return false;
}
return true;
} }
@Override @Override

2
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/model/JdbcHistoricItem.java → bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/dto/JdbcHistoricItem.java
View File

@ -10,7 +10,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.openhab.persistence.jdbc.model; package org.openhab.persistence.jdbc.dto;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;

2
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/model/JdbcPersistenceItemInfo.java → bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/dto/JdbcPersistenceItemInfo.java
View File

@ -10,7 +10,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.openhab.persistence.jdbc.model; package org.openhab.persistence.jdbc.dto;
import java.util.Date; import java.util.Date;

6
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java
View File

@ -25,9 +25,9 @@ import org.openhab.core.items.Item;
import org.openhab.core.persistence.FilterCriteria; import org.openhab.core.persistence.FilterCriteria;
import org.openhab.core.persistence.HistoricItem; import org.openhab.core.persistence.HistoricItem;
import org.openhab.core.persistence.PersistenceItemInfo; import org.openhab.core.persistence.PersistenceItemInfo;
import org.openhab.persistence.jdbc.model.ItemVO; import org.openhab.persistence.jdbc.dto.ItemVO;
import org.openhab.persistence.jdbc.model.ItemsVO; import org.openhab.persistence.jdbc.dto.ItemsVO;
import org.openhab.persistence.jdbc.model.JdbcPersistenceItemInfo; import org.openhab.persistence.jdbc.dto.JdbcPersistenceItemInfo;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
bundles/org.openhab.persistence.jdbc/src/main/resources/OH-INF/config/config.xml
View File

@ -71,7 +71,7 @@
#sqltype.CONTACT = VARCHAR(6) #sqltype.CONTACT = VARCHAR(6)
#sqltype.DATETIME = DATETIME #sqltype.DATETIME = DATETIME
#sqltype.DIMMER = TINYINT #sqltype.DIMMER = TINYINT
#sqltype.LOCATION = VARCHAR(30) #sqltype.LOCATION = VARCHAR(50)
#sqltype.NUMBER = DOUBLE #sqltype.NUMBER = DOUBLE
#sqltype.ROLLERSHUTTER = TINYINT #sqltype.ROLLERSHUTTER = TINYINT
#sqltype.STRING = VARCHAR(65500) #sqltype.STRING = VARCHAR(65500)
@ -109,7 +109,7 @@
</parameter> </parameter>
<parameter name="sqltype.LOCATION" type="text"> <parameter name="sqltype.LOCATION" type="text">
<label>SqlType LOCATION</label> <label>SqlType LOCATION</label>
<description><![CDATA[Overrides used JDBC/SQL datatype for LOCATION <br>(optional, default: "VARCHAR(30)").]]></description> <description><![CDATA[Overrides used JDBC/SQL datatype for LOCATION <br>(optional, default: "VARCHAR(50)").]]></description>
</parameter> </parameter>
<parameter name="sqltype.NUMBER" type="text"> <parameter name="sqltype.NUMBER" type="text">
<label>SqlType NUMBER</label> <label>SqlType NUMBER</label>