From 000226df212ea7a3fcfd0b076f6a94c109668a28 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 7 Feb 2014 17:00:26 +0100 Subject: [PATCH] Big refactoring due to MySQL feature. --- resources/misc/db_init_sqlite.sql | 17 ++++++++--------- resources/misc/db_init_sqlite_memory.sql | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/resources/misc/db_init_sqlite.sql b/resources/misc/db_init_sqlite.sql index e847c144c..698a8b069 100644 --- a/resources/misc/db_init_sqlite.sql +++ b/resources/misc/db_init_sqlite.sql @@ -1,11 +1,12 @@ DROP TABLE IF EXISTS Information; -- ! CREATE TABLE IF NOT EXISTS Information ( - key TEXT PRIMARY KEY, - value TEXT NOT NULL + id INTEGER PRIMARY KEY, + inf_key TEXT NOT NULL, + inf_value TEXT NOT NULL ); -- ! -INSERT INTO Information VALUES ('schema_version', '0.0.1'); +INSERT INTO Information VALUES (1, 'schema_version', '0.0.1'); -- ! DROP TABLE IF EXISTS Categories; -- ! @@ -16,9 +17,7 @@ CREATE TABLE IF NOT EXISTS Categories ( description TEXT, date_created INTEGER NOT NULL CHECK (date_created != 0), icon BLOB, - type INTEGER NOT NULL, - - FOREIGN KEY (parent_id) REFERENCES Categories (id) + type INTEGER NOT NULL ); -- ! DROP TABLE IF EXISTS Feeds; @@ -55,9 +54,9 @@ DROP TABLE IF EXISTS Messages; -- ! CREATE TABLE IF NOT EXISTS Messages ( id INTEGER PRIMARY KEY, - read INTEGER(1) NOT NULL CHECK (read >= 0 AND read <= 1) DEFAULT (0), - deleted INTEGER(1) NOT NULL CHECK (deleted >= 0 AND deleted <= 1) DEFAULT (0), - important INTEGER(1) NOT NULL CHECK (important >= 0 AND important <= 1) DEFAULT (0), + is_read INTEGER(1) NOT NULL CHECK (is_read >= 0 AND is_read <= 1) DEFAULT (0), + is_deleted INTEGER(1) NOT NULL CHECK (is_deleted >= 0 AND is_deleted <= 1) DEFAULT (0), + is_important INTEGER(1) NOT NULL CHECK (is_important >= 0 AND is_important <= 1) DEFAULT (0), feed INTEGER NOT NULL, title TEXT NOT NULL CHECK (title != ''), url TEXT, diff --git a/resources/misc/db_init_sqlite_memory.sql b/resources/misc/db_init_sqlite_memory.sql index 74a743108..9675d60e3 100644 --- a/resources/misc/db_init_sqlite_memory.sql +++ b/resources/misc/db_init_sqlite_memory.sql @@ -1,11 +1,12 @@ DROP TABLE IF EXISTS Information; -- ! CREATE TABLE IF NOT EXISTS Information ( - key TEXT PRIMARY KEY, - value TEXT NOT NULL + id INTEGER PRIMARY KEY, + inf_key TEXT NOT NULL, + inf_value TEXT NOT NULL ); -- ! -INSERT INTO Information VALUES ('schema_version', '0.0.1'); +INSERT INTO Information VALUES (1, 'schema_version', '0.0.1'); -- ! DROP TABLE IF EXISTS Categories; -- ! @@ -16,9 +17,7 @@ CREATE TABLE IF NOT EXISTS Categories ( description TEXT, date_created INTEGER NOT NULL CHECK (date_created != 0), icon BLOB, - type INTEGER NOT NULL, - - FOREIGN KEY (parent_id) REFERENCES Categories (id) + type INTEGER NOT NULL ); -- ! DROP TABLE IF EXISTS Feeds; @@ -55,9 +54,9 @@ DROP TABLE IF EXISTS Messages; -- ! CREATE TABLE IF NOT EXISTS Messages ( id INTEGER PRIMARY KEY, - read INTEGER(1) NOT NULL CHECK (read >= 0 AND read <= 1) DEFAULT (0), - deleted INTEGER(1) NOT NULL CHECK (deleted >= 0 AND deleted <= 1) DEFAULT (0), - important INTEGER(1) NOT NULL CHECK (important >= 0 AND important <= 1) DEFAULT (0), + is_read INTEGER(1) NOT NULL CHECK (is_read >= 0 AND is_read <= 1) DEFAULT (0), + is_deleted INTEGER(1) NOT NULL CHECK (is_deleted >= 0 AND is_deleted <= 1) DEFAULT (0), + is_important INTEGER(1) NOT NULL CHECK (is_important >= 0 AND is_important <= 1) DEFAULT (0), feed INTEGER NOT NULL, title TEXT NOT NULL CHECK (title != ''), url TEXT,