Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit eb519e4

Browse files
MateStrysewskeMateStrysewske
committed
[GITFLOW]merging 'hotfix-1.44.1' into 'master'
2 parents 11f1e85 + f432b20 commit eb519e4

10 files changed

Lines changed: 20 additions & 11 deletions

File tree

‎sormas-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>de.symeda.sormas</groupId>
44
<artifactId>sormas-base</artifactId>
5-
<version>1.44.0</version>
5+
<version>1.44.1</version>
66
<relativePath>../sormas-base</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
127127
// name of the database file for your application. Stored in data/data/de.symeda.sormas.app/databases
128128
public static final String DATABASE_NAME = "sormas.db";
129129
// any time you make changes to your database objects, you may have to increase the database version
130-
public static final int DATABASE_VERSION = 211;
130+
public static final int DATABASE_VERSION = 212;
131131

132132
private static DatabaseHelper instance = null;
133133

@@ -1414,7 +1414,16 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
14141414
getDao(EpiDataBurial.class).executeRaw("UPDATE epidataburial SET changeDate = 0 WHERE changeDate IS NOT NULL;");
14151415
getDao(EpiDataTravel.class).executeRaw("UPDATE epidatatravel SET changeDate = 0 WHERE changeDate IS NOT NULL;");
14161416
getDao(EpiDataGathering.class).executeRaw("UPDATE epidatagathering SET changeDate = 0 WHERE changeDate IS NOT NULL;");
1417-
1417+
case 211:
1418+
// Re-synchronize all contacts and epi data to prevent missing embedded entities
1419+
currentVersion = 211;
1420+
getDao(Sample.class).executeRaw("ALTER TABLE contacts ADD COLUMN epiData_id bigint REFERENCES epidata (id);");
1421+
getDao(Contact.class).executeRaw("UPDATE contacts SET changeDate = 0 WHERE changeDate IS NOT NULL;");
1422+
getDao(EpiData.class).executeRaw("UPDATE epidata SET changeDate = 0 WHERE changeDate IS NOT NULL;");
1423+
getDao(EpiDataBurial.class).executeRaw("UPDATE epidataburial SET changeDate = 0 WHERE changeDate IS NOT NULL;");
1424+
getDao(EpiDataTravel.class).executeRaw("UPDATE epidatatravel SET changeDate = 0 WHERE changeDate IS NOT NULL;");
1425+
getDao(EpiDataGathering.class).executeRaw("UPDATE epidatagathering SET changeDate = 0 WHERE changeDate IS NOT NULL;");
1426+
getDao(Location.class).executeRaw("UPDATE location SET changeDate = 0 WHERE changeDate IS NOT NULL;");
14181427

14191428
// ATTENTION: break should only be done after last version
14201429

‎sormas-app/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.44.0</version>
6+
<version>1.44.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-backend/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.44.0</version>
6+
<version>1.44.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-base/dependencies/serverlibs.pom‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>sormas-base</artifactId>
1010
<groupId>de.symeda.sormas</groupId>
11-
<version>1.44.0</version>
11+
<version>1.44.1</version>
1212
<relativePath>../</relativePath>
1313
</parent>
1414

‎sormas-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.symeda.sormas</groupId>
66
<artifactId>sormas-base</artifactId>
77
<packaging>pom</packaging>
8-
<version>1.44.0</version>
8+
<version>1.44.1</version>
99

1010
<prerequisites>
1111
<maven>3.0</maven>

‎sormas-ear/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>de.symeda.sormas</groupId>
55
<artifactId>sormas-base</artifactId>
6-
<version>1.44.0</version>
6+
<version>1.44.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99

‎sormas-rest/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>de.symeda.sormas</groupId>
55
<artifactId>sormas-base</artifactId>
6-
<version>1.44.0</version>
6+
<version>1.44.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99

‎sormas-ui/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.44.0</version>
6+
<version>1.44.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-widgetset/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.44.0</version>
6+
<version>1.44.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)