From 3fe08fa67d2b6049b1cb20156f14e8ebc220c0db Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 3 Dec 2015 14:09:02 +0100 Subject: [PATCH] Removed Messages -> Feeds foreign key. --- resources/misc/db_init_mysql.sql | 1 - resources/misc/db_init_sqlite.sql | 1 - resources/misc/db_update_mysql_3_4.sql | 3 +++ src/core/message.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/misc/db_init_mysql.sql b/resources/misc/db_init_mysql.sql index f95265c81..fb10284de 100644 --- a/resources/misc/db_init_mysql.sql +++ b/resources/misc/db_init_mysql.sql @@ -85,6 +85,5 @@ CREATE TABLE IF NOT EXISTS Messages ( account_id INTEGER NOT NULL, custom_id TEXT, - FOREIGN KEY (feed) REFERENCES Feeds (id), FOREIGN KEY (account_id) REFERENCES Accounts (id) ); \ No newline at end of file diff --git a/resources/misc/db_init_sqlite.sql b/resources/misc/db_init_sqlite.sql index 5a7290abc..41e5945c4 100644 --- a/resources/misc/db_init_sqlite.sql +++ b/resources/misc/db_init_sqlite.sql @@ -80,6 +80,5 @@ CREATE TABLE IF NOT EXISTS Messages ( account_id INTEGER NOT NULL, custom_id TEXT, - FOREIGN KEY (feed) REFERENCES Feeds (id), FOREIGN KEY (account_id) REFERENCES Accounts (id) ); \ No newline at end of file diff --git a/resources/misc/db_update_mysql_3_4.sql b/resources/misc/db_update_mysql_3_4.sql index eb283ab1c..0c05416e2 100644 --- a/resources/misc/db_update_mysql_3_4.sql +++ b/resources/misc/db_update_mysql_3_4.sql @@ -34,4 +34,7 @@ ADD COLUMN custom_id TEXT; ALTER TABLE Categories ADD COLUMN custom_id TEXT; -- ! +ALTER TABLE Messages +DROP FOREIGN KEY feed; +-- ! UPDATE Information SET inf_value = '4' WHERE inf_key = 'schema_version'; \ No newline at end of file diff --git a/src/core/message.h b/src/core/message.h index eacad327c..f0cd4ab3b 100755 --- a/src/core/message.h +++ b/src/core/message.h @@ -50,7 +50,7 @@ class Message { QString m_contents; QDateTime m_created; int m_feedId; - + QString m_customId; QList m_enclosures;