akonadi-server/Fix-SQLite-DB-schema-upgrade.patch

34 lines
1.4 KiB
Diff
Raw Normal View History

From 2fcd7c4c4f6cc512de9d7778ab67d637934e7638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Sat, 26 Aug 2017 12:03:40 +0200
Subject: Fix SQLite DB schema upgrade to version 35
SQLite does not support DROP COLUMN and our upgrade language is not
expressive enough to handle that in another way, so for now we just
leave the 'external' column in PartTable on SQLite, it will simply
be ignored. On other backends the column is removed as expected.
BUG: 384024
FIXED-IN: 5.6.1
---
src/server/storage/dbupdate.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/server/storage/dbupdate.xml b/src/server/storage/dbupdate.xml
index 80fb9d7..c5f9777 100644
--- a/src/server/storage/dbupdate.xml
+++ b/src/server/storage/dbupdate.xml
@@ -323,7 +323,8 @@
<update version="35" abortOnFailure="true">
<raw-sql backends="mysql,sqlite">UPDATE PartTable SET storage = external;</raw-sql>
- <raw-sql backends="mysql,sqlite">ALTER TABLE PartTable DROP COLUMN external;</raw-sql>
+ <raw-sql backends="mysql">ALTER TABLE PartTable DROP COLUMN external;</raw-sql>
+ <!-- TODO: SQLITE: drop the column as well, but SQLite does not have DROP COLUMN //-->
<raw-sql backends="psql">UPDATE PartTable SET storage = cast(external as integer);</raw-sql>
<raw-sql backends="psql">ALTER TABLE PartTable DROP COLUMN external;</raw-sql>
</update>
--
cgit v0.11.2