Commit 3d54384be7568867f476e5211e70205f3a1aca5d

Authored by Andrii Shvaika
2 parents 09d88232 89d19fb3

Merge branch 'master' of github.com:thingsboard/thingsboard

... ... @@ -46,7 +46,7 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
46 46
47 47 private static final String CREATE_PARTITION_TS_KV_TABLE = "create_partition_ts_kv_table()";
48 48 private static final String CREATE_NEW_TS_KV_LATEST_TABLE = "create_new_ts_kv_latest_table()";
49   - private static final String CREATE_PARTITIONS = "create_partitions()";
  49 + private static final String CREATE_PARTITIONS = "create_partitions(IN partition_type varchar)";
50 50 private static final String CREATE_TS_KV_DICTIONARY_TABLE = "create_ts_kv_dictionary_table()";
51 51 private static final String INSERT_INTO_DICTIONARY = "insert_into_dictionary()";
52 52 private static final String INSERT_INTO_TS_KV = "insert_into_ts_kv()";
... ... @@ -108,7 +108,6 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
108 108 executeQuery(conn, DROP_PROCEDURE_INSERT_INTO_TS_KV);
109 109 executeQuery(conn, DROP_PROCEDURE_CREATE_NEW_TS_KV_LATEST_TABLE);
110 110 executeQuery(conn, DROP_PROCEDURE_INSERT_INTO_TS_KV_LATEST);
111   - executeQuery(conn, DROP_PROCEDURE_INSERT_INTO_TS_KV_LATEST);
112 111 executeQuery(conn, DROP_FUNCTION_GET_PARTITION_DATA);
113 112
114 113 executeQuery(conn, "ALTER TABLE ts_kv ADD COLUMN IF NOT EXISTS json_v json;");
... ...