SORMAS-Foundation#2916 fix merge issues

Author: lgal

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java

@@ -128,7 +128,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "sormas.db";
 	// any time you make changes to your database objects, you may have to increase the database version
 
-	public static final int DATABASE_VERSION = 231;
+	public static final int DATABASE_VERSION = 232;
 
 	private static DatabaseHelper instance = null;
 
@@ -1611,8 +1611,8 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN endOfIsolationReason varchar(255);");
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN endOfIsolationReasonDetails varchar(512);");
 
-			case 230:
-				currentVersion = 230;
+			case 231:
+				currentVersion = 231;
 				getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN shivering varchar(255);");
 
 				// ATTENTION: break should only be done after last version

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -5368,5 +5368,5 @@ ALTER TABLE symptoms_history ADD COLUMN shivering character varying(255);
 ALTER TABLE symptoms_history RENAME generalsignsofdisease to feelingill;
 
 
-INSERT INTO schema_version (version_number, comment) VALUES (257, 'Split general signs of disease #2916');
+INSERT INTO schema_version (version_number, comment) VALUES (258, 'Split general signs of disease #2916');
 -- *** Insert new sql commands BEFORE this line ***