Created HsqlEntityDatabaseSchemaService, improvement TimescaleTsDatabaseUpgradeService and TimescaleInsertTsRepository

application/src/main/java/org/thingsboard/server/service/install/HsqlEntityDatabaseSchemaService.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.install;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.util.HsqlDao;
+import org.thingsboard.server.dao.util.SqlDao;
+
+@Service
+@HsqlDao
+@SqlDao
+@Profile("install")
+public class HsqlEntityDatabaseSchemaService extends SqlAbstractDatabaseSchemaService
+        implements EntityDatabaseSchemaService {
+    protected HsqlEntityDatabaseSchemaService() {
+        super("schema-entities-hsql.sql", "schema-entities-idx.sql");
+    }
+}
+

application/src/main/java/org/thingsboard/server/service/install/SqlEntityDatabaseSchemaService.java → application/src/main/java/org/thingsboard/server/service/install/PsqlEntityDatabaseSchemaService.java

@@ -17,14 +17,16 @@ package org.thingsboard.server.service.install;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.util.PsqlDao;
 import org.thingsboard.server.dao.util.SqlDao;
 
 @Service
 @SqlDao
+@PsqlDao
 @Profile("install")
-public class SqlEntityDatabaseSchemaService extends SqlAbstractDatabaseSchemaService
+public class PsqlEntityDatabaseSchemaService extends SqlAbstractDatabaseSchemaService
         implements EntityDatabaseSchemaService {
-    public SqlEntityDatabaseSchemaService() {
+    public PsqlEntityDatabaseSchemaService() {
         super("schema-entities.sql", "schema-entities-idx.sql");
     }
 }

application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java

@@ -104,7 +104,7 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr
                         executeDropStatement(conn, DROP_FUNCTION_INSERT_INTO_TENANT_TS_KV);
                         executeDropStatement(conn, DROP_FUNCTION_INSERT_INTO_TS_KV_LATEST);
 
-                        executeQuery(conn, "ALTER TABLE ts_kv ADD COLUMN json_v json;");
+                        executeQuery(conn, "ALTER TABLE tenant_ts_kv ADD COLUMN json_v json;");
                         executeQuery(conn, "ALTER TABLE ts_kv_latest ADD COLUMN json_v json;");
 
                         log.info("schema timeseries updated!");

dao/src/main/java/org/thingsboard/server/dao/sqlts/insert/timescale/TimescaleInsertTsRepository.java

@@ -53,7 +53,7 @@ public class TimescaleInsertTsRepository extends AbstractInsertRepository implem
 
                 if (tsKvEntity.getBooleanValue() != null) {
                     ps.setBoolean(5, tsKvEntity.getBooleanValue());
-                    ps.setBoolean(9, tsKvEntity.getBooleanValue());
+                    ps.setBoolean(10, tsKvEntity.getBooleanValue());
                 } else {
                     ps.setNull(5, Types.BOOLEAN);
                     ps.setNull(10, Types.BOOLEAN);