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

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
computergeek1507 · Jul 13, 2021 · 91e363b · 91e363b
1 parent 258e96a
commit 91e363b
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 32 deletions.
diff --git a/bundles/org.openhab.persistence.jdbc/README.md b/bundles/org.openhab.persistence.jdbc/README.md
@@ -48,8 +48,10 @@ This service can be configured in the file `services/jdbc.cfg`.
 | sqltype.CONTACT           | `VARCHAR(6)`                                                 |    No     | see above                                                    |
 | sqltype.DATETIME          | `DATETIME`                                                   |    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.PLAYER            | `VARCHAR(20)`                                                |    No     | see above                                                    |
 | sqltype.ROLLERSHUTTER     | `TINYINT`                                                    |    No     | see above                                                    |
 | sqltype.STRING            | `VARCHAR(65500)`                                             |    No     | see above                                                    |
 | sqltype.SWITCH            | `VARCHAR(6)`                                                 |    No     | see above                                                    |

diff --git a/...g.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java b/...g.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java
@@ -50,9 +50,9 @@
 import org.openhab.core.persistence.HistoricItem;
 import org.openhab.core.types.State;
 import org.openhab.core.types.TypeParser;
-import org.openhab.persistence.jdbc.model.ItemVO;
-import org.openhab.persistence.jdbc.model.ItemsVO;
-import org.openhab.persistence.jdbc.model.JdbcHistoricItem;
+import org.openhab.persistence.jdbc.dto.ItemVO;
+import org.openhab.persistence.jdbc.dto.ItemsVO;
+import org.openhab.persistence.jdbc.dto.JdbcHistoricItem;
 import org.openhab.persistence.jdbc.utils.DbMetaData;
 import org.openhab.persistence.jdbc.utils.StringUtilsExt;
 import org.slf4j.Logger;
@@ -155,7 +155,7 @@ private void initSqlTypes() {
         sqlTypes.put("DATETIMEITEM", "TIMESTAMP");
         sqlTypes.put("DIMMERITEM", "TINYINT");
         sqlTypes.put("IMAGEITEM", "VARCHAR(65500)");// jdbc max 21845
-        sqlTypes.put("LOCATIONITEM", "VARCHAR(30)");
+        sqlTypes.put("LOCATIONITEM", "VARCHAR(50)");
         sqlTypes.put("NUMBERITEM", "DOUBLE");
         sqlTypes.put("PLAYERITEM", "VARCHAR(20)");
         sqlTypes.put("ROLLERSHUTTERITEM", "TINYINT");

diff --git a/....openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcDerbyDAO.java b/....openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcDerbyDAO.java
@@ -25,9 +25,9 @@
 import org.openhab.core.persistence.FilterCriteria;
 import org.openhab.core.persistence.FilterCriteria.Ordering;
 import org.openhab.core.persistence.HistoricItem;
-import org.openhab.persistence.jdbc.model.ItemVO;
-import org.openhab.persistence.jdbc.model.ItemsVO;
-import org.openhab.persistence.jdbc.model.JdbcHistoricItem;
+import org.openhab.persistence.jdbc.dto.ItemVO;
+import org.openhab.persistence.jdbc.dto.ItemsVO;
+import org.openhab.persistence.jdbc.dto.JdbcHistoricItem;
 import org.openhab.persistence.jdbc.utils.StringUtilsExt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcH2DAO.java b/...org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcH2DAO.java
@@ -14,7 +14,7 @@
 
 import org.knowm.yank.Yank;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcHsqldbDAO.java b/...openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcHsqldbDAO.java
@@ -14,8 +14,8 @@
 
 import org.knowm.yank.Yank;
 import org.openhab.core.items.Item;
-import org.openhab.persistence.jdbc.model.ItemVO;
-import org.openhab.persistence.jdbc.model.ItemsVO;
+import org.openhab.persistence.jdbc.dto.ItemVO;
+import org.openhab.persistence.jdbc.dto.ItemsVO;
 import org.openhab.persistence.jdbc.utils.StringUtilsExt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...hab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcPostgresqlDAO.java b/...hab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcPostgresqlDAO.java
@@ -19,8 +19,8 @@
 import org.openhab.core.items.Item;
 import org.openhab.core.persistence.FilterCriteria;
 import org.openhab.core.persistence.FilterCriteria.Ordering;
-import org.openhab.persistence.jdbc.model.ItemVO;
-import org.openhab.persistence.jdbc.model.ItemsVO;
+import org.openhab.persistence.jdbc.dto.ItemVO;
+import org.openhab.persistence.jdbc.dto.ItemsVO;
 import org.openhab.persistence.jdbc.utils.StringUtilsExt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcSqliteDAO.java b/...openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcSqliteDAO.java
@@ -14,8 +14,8 @@
 
 import org.knowm.yank.Yank;
 import org.openhab.core.items.Item;
-import org.openhab.persistence.jdbc.model.ItemVO;
-import org.openhab.persistence.jdbc.model.ItemsVO;
+import org.openhab.persistence.jdbc.dto.ItemVO;
+import org.openhab.persistence.jdbc.dto.ItemsVO;
 import org.openhab.persistence.jdbc.utils.StringUtilsExt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

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

diff --git a/...sistence/jdbc/model/JdbcHistoricItem.java → ...ersistence/jdbc/dto/JdbcHistoricItem.java b/...sistence/jdbc/model/JdbcHistoricItem.java → ...ersistence/jdbc/dto/JdbcHistoricItem.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.persistence.jdbc.model;
+package org.openhab.persistence.jdbc.dto;
 
 import java.time.ZonedDateTime;
 

diff --git a/...e/jdbc/model/JdbcPersistenceItemInfo.java → ...nce/jdbc/dto/JdbcPersistenceItemInfo.java b/...e/jdbc/model/JdbcPersistenceItemInfo.java → ...nce/jdbc/dto/JdbcPersistenceItemInfo.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.persistence.jdbc.model;
+package org.openhab.persistence.jdbc.dto;
 
 import java.util.Date;
 

diff --git a/...nhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java b/...nhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java
@@ -25,9 +25,9 @@
 import org.openhab.core.persistence.FilterCriteria;
 import org.openhab.core.persistence.HistoricItem;
 import org.openhab.core.persistence.PersistenceItemInfo;
-import org.openhab.persistence.jdbc.model.ItemVO;
-import org.openhab.persistence.jdbc.model.ItemsVO;
-import org.openhab.persistence.jdbc.model.JdbcPersistenceItemInfo;
+import org.openhab.persistence.jdbc.dto.ItemVO;
+import org.openhab.persistence.jdbc.dto.ItemsVO;
+import org.openhab.persistence.jdbc.dto.JdbcPersistenceItemInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/bundles/org.openhab.persistence.jdbc/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.persistence.jdbc/src/main/resources/OH-INF/config/config.xml
@@ -71,7 +71,7 @@
 			#sqltype.CONTACT = VARCHAR(6)
 			#sqltype.DATETIME = DATETIME
 			#sqltype.DIMMER = TINYINT
-			#sqltype.LOCATION = VARCHAR(30)
+			#sqltype.LOCATION = VARCHAR(50)
 			#sqltype.NUMBER = DOUBLE
 			#sqltype.ROLLERSHUTTER = TINYINT
 			#sqltype.STRING = VARCHAR(65500)
@@ -109,7 +109,7 @@
 		</parameter>
 		<parameter name="sqltype.LOCATION" type="text">
 			<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 name="sqltype.NUMBER" type="text">
 			<label>SqlType NUMBER</label>