Added drop of edge_license_key and cloud_endpoint columns during upgrade
This commit is contained in:
		
							parent
							
								
									6356e998a3
								
							
						
					
					
						commit
						90ba0de432
					
				@ -217,6 +217,7 @@ public class ThingsboardInstallService {
 | 
			
		||||
                        case "3.3.3":
 | 
			
		||||
                            log.info("Upgrading ThingsBoard from version 3.3.3 to 3.3.4 ...");
 | 
			
		||||
                            log.info("Updating system data...");
 | 
			
		||||
                            databaseEntitiesUpgradeService.upgradeDatabase("3.3.3");
 | 
			
		||||
                            systemDataLoaderService.updateSystemWidgets();
 | 
			
		||||
                            break;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -512,6 +512,22 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
 | 
			
		||||
                    log.error("Failed updating schema!!!", e);
 | 
			
		||||
                }
 | 
			
		||||
                break;
 | 
			
		||||
            case "3.3.3":
 | 
			
		||||
                try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
 | 
			
		||||
                    log.info("Updating schema ...");
 | 
			
		||||
                    try {
 | 
			
		||||
                        conn.createStatement().execute("ALTER TABLE edge DROP COLUMN edge_license_key;"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
 | 
			
		||||
                        conn.createStatement().execute("ALTER TABLE edge DROP COLUMN cloud_endpoint;"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
 | 
			
		||||
                    } catch (Exception ignored) {
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                    log.info("Updating schema settings...");
 | 
			
		||||
                    conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3003004;");
 | 
			
		||||
                    log.info("Schema updated.");
 | 
			
		||||
                } catch (Exception e) {
 | 
			
		||||
                    log.error("Failed updating schema!!!", e);
 | 
			
		||||
                }
 | 
			
		||||
                break;
 | 
			
		||||
            default:
 | 
			
		||||
                throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user