From 7451df9865cee5806e587d410b526449a5e127b8 Mon Sep 17 00:00:00 2001
From: Mark Hilbush <mark@hilbush.com>
Date: Sat, 12 Dec 2020 02:51:12 -0500
Subject: [PATCH] [jdbc] Add missing item types Player and Image (#9334)

- Add missing item types Player and Image

Closes #2819

Signed-off-by: Mark Hilbush <mark@hilbush.com>
---
 .../java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java     | 4 +++-
 .../java/org/openhab/persistence/jdbc/db/JdbcDerbyDAO.java    | 1 +
 .../org/openhab/persistence/jdbc/db/JdbcPostgresqlDAO.java    | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java
index ce1e791e17..661880457b 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java
@@ -150,8 +150,10 @@ public class JdbcBaseDAO {
         sqlTypes.put("CONTACTITEM", "VARCHAR(6)");
         sqlTypes.put("DATETIMEITEM", "TIMESTAMP");
         sqlTypes.put("DIMMERITEM", "TINYINT");
+        sqlTypes.put("IMAGEITEM", "VARCHAR(65500)");// jdbc max 21845
         sqlTypes.put("LOCATIONITEM", "VARCHAR(30)");
         sqlTypes.put("NUMBERITEM", "DOUBLE");
+        sqlTypes.put("PLAYERITEM", "VARCHAR(20)");
         sqlTypes.put("ROLLERSHUTTERITEM", "TINYINT");
         sqlTypes.put("STRINGITEM", "VARCHAR(65500)");// jdbc max 21845
         sqlTypes.put("SWITCHITEM", "VARCHAR(6)");
@@ -486,7 +488,7 @@ public class JdbcBaseDAO {
                     ZonedDateTime.ofInstant(Instant.ofEpochMilli(objectAsLong(v)), ZoneId.systemDefault()));
         } else if (item instanceof StringItem) {
             return StringType.valueOf(((String) v).toString());
-        } else {// Call, Location, String
+        } else {// Call, Image, Location, Player, String
             return StringType.valueOf(((String) v).toString());
         }
     }
diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcDerbyDAO.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcDerbyDAO.java
index ad77db9180..369da5ce91 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcDerbyDAO.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcDerbyDAO.java
@@ -63,6 +63,7 @@ public class JdbcDerbyDAO extends JdbcBaseDAO {
     private void initSqlTypes() {
         sqlTypes.put("DATETIMEITEM", "TIMESTAMP");
         sqlTypes.put("DIMMERITEM", "SMALLINT");
+        sqlTypes.put("IMAGEITEM", "VARCHAR(32000)");
         sqlTypes.put("ROLLERSHUTTERITEM", "SMALLINT");
         sqlTypes.put("STRINGITEM", "VARCHAR(32000)");
         sqlTypes.put("tablePrimaryValue", "CURRENT_TIMESTAMP");
diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcPostgresqlDAO.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcPostgresqlDAO.java
index 306e65ec8b..d7292cae1b 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcPostgresqlDAO.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcPostgresqlDAO.java
@@ -73,8 +73,10 @@ public class JdbcPostgresqlDAO extends JdbcBaseDAO {
         sqlTypes.put("CONTACTITEM", "VARCHAR");
         sqlTypes.put("DATETIMEITEM", "TIMESTAMP");
         sqlTypes.put("DIMMERITEM", "SMALLINT");
+        sqlTypes.put("IMAGEITEM", "VARCHAR");
         sqlTypes.put("LOCATIONITEM", "VARCHAR");
         sqlTypes.put("NUMBERITEM", "DOUBLE PRECISION");
+        sqlTypes.put("PLAYERITEM", "VARCHAR");
         sqlTypes.put("ROLLERSHUTTERITEM", "SMALLINT");
         sqlTypes.put("STRINGITEM", "VARCHAR");
         sqlTypes.put("SWITCHITEM", "VARCHAR");
-- 
2.47.3