diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
| commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
| tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/db/Db.vala | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/db/Db.vala')
| -rw-r--r-- | src/db/Db.vala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/db/Db.vala b/src/db/Db.vala index e4f83bf..3eca8ce 100644 --- a/src/db/Db.vala +++ b/src/db/Db.vala @@ -207,7 +207,7 @@ private VerifyResult upgrade_database(int input_version) { if (!DatabaseTable.has_column("EventTable", "primary_source_id")) { message("upgrade_database: adding primary_source_id column to EventTable"); - if (!DatabaseTable.add_column("EventTable", "primary_source_id", "INTEGER DEFAULT 0")) + if (!DatabaseTable.add_column("EventTable", "primary_source_id", "TEXT")) return VerifyResult.UPGRADE_ERROR; } @@ -304,7 +304,7 @@ private VerifyResult upgrade_database(int input_version) { if (!DatabaseTable.add_column("PhotoTable", "comment", "TEXT")) return VerifyResult.UPGRADE_ERROR; } - if (!DatabaseTable.has_column("VideoTable", "comment")) { + if (DatabaseTable.has_table("VideoTable") & !DatabaseTable.has_column("VideoTable", "comment")) { message("upgrade_database: adding comment column to VideoTable"); if (!DatabaseTable.add_column("VideoTable", "comment", "TEXT")) return VerifyResult.UPGRADE_ERROR; |