Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge

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

@@ -441,7 +441,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                         schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.2.2", SCHEMA_UPDATE_SQL);
                         loadSql(schemaUpdateFile, conn);
                         try {
-                            conn.createStatement().execute("ALTER TABLE rule_chain ADD type varchar(255) DEFAULT 'CORE'"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
+                            conn.createStatement().execute("ALTER TABLE rule_chain ADD COLUMN type varchar(255) DEFAULT 'CORE'"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
                         } catch (Exception e) {}
 
                         conn.createStatement().execute("CREATE TABLE IF NOT EXISTS resource (" +