public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[jdbc] Add missing item types Player and Image (#9334)

Browse Source 
- Add missing item types Player and Image

Closes #2819 

Signed-off-by: Mark Hilbush <mark@hilbush.com>
This commit is contained in:
Mark Hilbush 2020-12-12 02:51:12 -05:00 committed by GitHub
parent 5d49188e0b
commit 7451df9865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,8 +150,10 @@ public class JdbcBaseDAO {
sqlTypes.put("CONTACTITEM", "VARCHAR(6)"); sqlTypes.put("CONTACTITEM", "VARCHAR(6)");
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("LOCATIONITEM", "VARCHAR(30)"); sqlTypes.put("LOCATIONITEM", "VARCHAR(30)");
sqlTypes.put("NUMBERITEM", "DOUBLE"); sqlTypes.put("NUMBERITEM", "DOUBLE");
sqlTypes.put("PLAYERITEM", "VARCHAR(20)");
sqlTypes.put("ROLLERSHUTTERITEM", "TINYINT"); sqlTypes.put("ROLLERSHUTTERITEM", "TINYINT");
sqlTypes.put("STRINGITEM", "VARCHAR(65500)");// jdbc max 21845 sqlTypes.put("STRINGITEM", "VARCHAR(65500)");// jdbc max 21845
sqlTypes.put("SWITCHITEM", "VARCHAR(6)"); sqlTypes.put("SWITCHITEM", "VARCHAR(6)");
@ -486,7 +488,7 @@ public class JdbcBaseDAO {
ZonedDateTime.ofInstant(Instant.ofEpochMilli(objectAsLong(v)), ZoneId.systemDefault())); ZonedDateTime.ofInstant(Instant.ofEpochMilli(objectAsLong(v)), ZoneId.systemDefault()));
} else if (item instanceof StringItem) { } else if (item instanceof StringItem) {
return StringType.valueOf(((String) v).toString()); return StringType.valueOf(((String) v).toString());
} else {// Call, Location, String } else {// Call, Image, Location, Player, String
return StringType.valueOf(((String) v).toString()); return StringType.valueOf(((String) v).toString());
} }
} }

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

@ -63,6 +63,7 @@ public class JdbcDerbyDAO extends JdbcBaseDAO {
private void initSqlTypes() { private void initSqlTypes() {
sqlTypes.put("DATETIMEITEM", "TIMESTAMP"); sqlTypes.put("DATETIMEITEM", "TIMESTAMP");
sqlTypes.put("DIMMERITEM", "SMALLINT"); sqlTypes.put("DIMMERITEM", "SMALLINT");
sqlTypes.put("IMAGEITEM", "VARCHAR(32000)");
sqlTypes.put("ROLLERSHUTTERITEM", "SMALLINT"); sqlTypes.put("ROLLERSHUTTERITEM", "SMALLINT");
sqlTypes.put("STRINGITEM", "VARCHAR(32000)"); sqlTypes.put("STRINGITEM", "VARCHAR(32000)");
sqlTypes.put("tablePrimaryValue", "CURRENT_TIMESTAMP"); sqlTypes.put("tablePrimaryValue", "CURRENT_TIMESTAMP");

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

@ -73,8 +73,10 @@ public class JdbcPostgresqlDAO extends JdbcBaseDAO {
sqlTypes.put("CONTACTITEM", "VARCHAR"); sqlTypes.put("CONTACTITEM", "VARCHAR");
sqlTypes.put("DATETIMEITEM", "TIMESTAMP"); sqlTypes.put("DATETIMEITEM", "TIMESTAMP");
sqlTypes.put("DIMMERITEM", "SMALLINT"); sqlTypes.put("DIMMERITEM", "SMALLINT");
sqlTypes.put("IMAGEITEM", "VARCHAR");
sqlTypes.put("LOCATIONITEM", "VARCHAR"); sqlTypes.put("LOCATIONITEM", "VARCHAR");
sqlTypes.put("NUMBERITEM", "DOUBLE PRECISION"); sqlTypes.put("NUMBERITEM", "DOUBLE PRECISION");
sqlTypes.put("PLAYERITEM", "VARCHAR");
sqlTypes.put("ROLLERSHUTTERITEM", "SMALLINT"); sqlTypes.put("ROLLERSHUTTERITEM", "SMALLINT");
sqlTypes.put("STRINGITEM", "VARCHAR"); sqlTypes.put("STRINGITEM", "VARCHAR");
sqlTypes.put("SWITCHITEM", "VARCHAR"); sqlTypes.put("SWITCHITEM", "VARCHAR");