pool/akonadi-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 518881 from home:wolfi323:branches:KDE:Applications

Browse Source 
- Add Fix-SQLite-DB-schema-upgrade.patch to fix Akonadi not starting when the sqlite plugin is used because the database schema upgrade fails due to unsupported syntax (kde#384024)

OBS-URL: https://build.opensuse.org/request/show/518881
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=122
This commit is contained in:
Christophe Giboudeaux 2017-08-27 07:20:28 +00:00 committed by Git OBS Bridge
parent 7648c9c638
commit dd88fdbbed
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Fix-SQLite-DB-schema-upgrade.patch Normal file
View File

@ -0,0 +1,33 @@
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

7
akonadi-server.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Aug 26 10:25:05 UTC 2017 - wbauer@tmo.at
- Add Fix-SQLite-DB-schema-upgrade.patch to fix Akonadi not
starting when the sqlite plugin is used because the database
schema upgrade fails due to unsupported syntax (kde#384024)
-------------------------------------------------------------------
Fri Aug 11 22:44:47 UTC 2017 - christophe@krop.fr

3
akonadi-server.spec
View File

@ -31,6 +31,8 @@ Group: System/GUI/KDE
Url: http://akonadi-project.org
Source: %{rname}-%{version}.tar.xz
Source99: akonadi-server-rpmlintrc
# PATCH-FIX-UPSTREAM
Patch: Fix-SQLite-DB-schema-upgrade.patch
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
%else
@ -172,6 +174,7 @@ service.
%prep
%setup -q -n %{rname}-%{version}
%patch -p1
%build
%cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir}