From 10f1841b54d41b7aa70fbca39ff72c86e3d88912 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Thu, 3 Dec 2015 13:42:50 +0100
Subject: [PATCH] Custom ID converted to string, added as property to Message
 class.

---
 resources/misc/db_init_mysql.sql        | 6 +++---
 resources/misc/db_init_sqlite.sql       | 6 +++---
 resources/misc/db_update_mysql_3_4.sql  | 6 +++---
 resources/misc/db_update_sqlite_3_4.sql | 6 +++---
 src/core/message.cpp                    | 2 +-
 src/core/message.h                      | 1 +
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/resources/misc/db_init_mysql.sql b/resources/misc/db_init_mysql.sql
index 91e1c5cb6..f95265c81 100644
--- a/resources/misc/db_init_mysql.sql
+++ b/resources/misc/db_init_mysql.sql
@@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS Categories (
   date_created    BIGINT        NOT NULL CHECK (date_created != 0),
   icon            BLOB,
   account_id      INTEGER       NOT NULL,
-  custom_id       INTEGER,
+  custom_id       TEXT,
   
   FOREIGN KEY (account_id) REFERENCES Accounts (id)
 );
@@ -62,7 +62,7 @@ CREATE TABLE IF NOT EXISTS Feeds (
   update_interval INTEGER       NOT NULL DEFAULT 15 CHECK (update_interval >= 5),
   type            INTEGER       NOT NULL CHECK (type >= 0),
   account_id      INTEGER       NOT NULL,
-  custom_id       INTEGER,
+  custom_id       TEXT,
   
   FOREIGN KEY (account_id) REFERENCES Accounts (id)
 );
@@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS Messages (
   is_pdeleted     INTEGER(1)  NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1),
   enclosures      TEXT,
   account_id      INTEGER     NOT NULL,
-  custom_id       INTEGER,
+  custom_id       TEXT,
   
   FOREIGN KEY (feed) REFERENCES Feeds (id),
   FOREIGN KEY (account_id) REFERENCES Accounts (id)
diff --git a/resources/misc/db_init_sqlite.sql b/resources/misc/db_init_sqlite.sql
index 05bdaacc6..5a7290abc 100644
--- a/resources/misc/db_init_sqlite.sql
+++ b/resources/misc/db_init_sqlite.sql
@@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS Categories (
   date_created    INTEGER     NOT NULL CHECK (date_created != 0),
   icon            BLOB,
   account_id      INTEGER     NOT NULL,
-  custom_id       INTEGER,
+  custom_id       TEXT,
   
   FOREIGN KEY (account_id) REFERENCES Accounts (id)
 );
@@ -57,7 +57,7 @@ CREATE TABLE IF NOT EXISTS Feeds (
   update_interval INTEGER     NOT NULL CHECK (update_interval >= 5) DEFAULT 15,
   type            INTEGER     NOT NULL CHECK (type >= 0),
   account_id      INTEGER     NOT NULL,
-  custom_id       INTEGER,
+  custom_id       TEXT,
   
   FOREIGN KEY (account_id) REFERENCES Accounts (id)
 );
@@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS Messages (
   is_pdeleted     INTEGER(1)  NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1),
   enclosures      TEXT,
   account_id      INTEGER     NOT NULL,
-  custom_id       INTEGER,
+  custom_id       TEXT,
   
   FOREIGN KEY (feed) REFERENCES Feeds (id),
   FOREIGN KEY (account_id) REFERENCES Accounts (id)
diff --git a/resources/misc/db_update_mysql_3_4.sql b/resources/misc/db_update_mysql_3_4.sql
index d194dacfd..eb283ab1c 100644
--- a/resources/misc/db_update_mysql_3_4.sql
+++ b/resources/misc/db_update_mysql_3_4.sql
@@ -26,12 +26,12 @@ ALTER TABLE Categories
 ADD COLUMN account_id  INTEGER  NOT NULL DEFAULT (1);
 -- !
 ALTER TABLE Messages
-ADD COLUMN custom_id  INTEGER;
+ADD COLUMN custom_id  TEXT;
 -- !
 ALTER TABLE Feeds
-ADD COLUMN custom_id  INTEGER;
+ADD COLUMN custom_id  TEXT;
 -- !
 ALTER TABLE Categories
-ADD COLUMN custom_id  INTEGER;
+ADD COLUMN custom_id  TEXT;
 -- !
 UPDATE Information SET inf_value = '4' WHERE inf_key = 'schema_version';
\ No newline at end of file
diff --git a/resources/misc/db_update_sqlite_3_4.sql b/resources/misc/db_update_sqlite_3_4.sql
index d194dacfd..eb283ab1c 100644
--- a/resources/misc/db_update_sqlite_3_4.sql
+++ b/resources/misc/db_update_sqlite_3_4.sql
@@ -26,12 +26,12 @@ ALTER TABLE Categories
 ADD COLUMN account_id  INTEGER  NOT NULL DEFAULT (1);
 -- !
 ALTER TABLE Messages
-ADD COLUMN custom_id  INTEGER;
+ADD COLUMN custom_id  TEXT;
 -- !
 ALTER TABLE Feeds
-ADD COLUMN custom_id  INTEGER;
+ADD COLUMN custom_id  TEXT;
 -- !
 ALTER TABLE Categories
-ADD COLUMN custom_id  INTEGER;
+ADD COLUMN custom_id  TEXT;
 -- !
 UPDATE Information SET inf_value = '4' WHERE inf_key = 'schema_version';
\ No newline at end of file
diff --git a/src/core/message.cpp b/src/core/message.cpp
index 59ad7a598..0338a5477 100755
--- a/src/core/message.cpp
+++ b/src/core/message.cpp
@@ -61,7 +61,7 @@ QString Enclosures::encodeEnclosuresToString(const QList<Enclosure> &enclosures)
 }
 
 Message::Message() {
-  m_title = m_url = m_author = m_contents = "";
+  m_title = m_url = m_author = m_contents = m_customId = "";
   m_feedId = 0;
   m_enclosures = QList<Enclosure>();
 }
diff --git a/src/core/message.h b/src/core/message.h
index 01330bbab..eacad327c 100755
--- a/src/core/message.h
+++ b/src/core/message.h
@@ -51,6 +51,7 @@ class Message {
     QDateTime m_created;
     int m_feedId;
 
+
     QList<Enclosure> m_enclosures;
 
     // Is true if "created" date was obtained directly