From 888bb39f3d035b0fbc4de13568fa350817a362d4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 14 Jun 2014 11:09:02 +0530 Subject: [PATCH] Change NON NULL to NOT NULL in the sqlite schema --- resources/metadata_sqlite.sql | 30 +++++++++++++++--------------- src/calibre/db/schema_upgrades.py | 18 +++++++++--------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/resources/metadata_sqlite.sql b/resources/metadata_sqlite.sql index 83f55c2762..d320fa767f 100644 --- a/resources/metadata_sqlite.sql +++ b/resources/metadata_sqlite.sql @@ -30,9 +30,9 @@ CREATE TABLE books_languages_link ( id INTEGER PRIMARY KEY, UNIQUE(book, lang_code) ); CREATE TABLE books_plugin_data(id INTEGER PRIMARY KEY, - book INTEGER NON NULL, - name TEXT NON NULL, - val TEXT NON NULL, + book INTEGER NOT NULL, + name TEXT NOT NULL, + val TEXT NOT NULL, UNIQUE(book,name)); CREATE TABLE books_publishers_link ( id INTEGER PRIMARY KEY, book INTEGER NOT NULL, @@ -55,8 +55,8 @@ CREATE TABLE books_tags_link ( id INTEGER PRIMARY KEY, UNIQUE(book, tag) ); CREATE TABLE comments ( id INTEGER PRIMARY KEY, - book INTEGER NON NULL, - text TEXT NON NULL COLLATE NOCASE, + book INTEGER NOT NULL, + text TEXT NOT NULL COLLATE NOCASE, UNIQUE(book) ); CREATE TABLE conversion_options ( id INTEGER PRIMARY KEY, @@ -78,10 +78,10 @@ CREATE TABLE custom_columns ( UNIQUE(label) ); CREATE TABLE data ( id INTEGER PRIMARY KEY, - book INTEGER NON NULL, - format TEXT NON NULL COLLATE NOCASE, - uncompressed_size INTEGER NON NULL, - name TEXT NON NULL, + book INTEGER NOT NULL, + format TEXT NOT NULL COLLATE NOCASE, + uncompressed_size INTEGER NOT NULL, + name TEXT NOT NULL, UNIQUE(book, format) ); CREATE TABLE feeds ( id INTEGER PRIMARY KEY, @@ -90,13 +90,13 @@ CREATE TABLE feeds ( id INTEGER PRIMARY KEY, UNIQUE(title) ); CREATE TABLE identifiers ( id INTEGER PRIMARY KEY, - book INTEGER NON NULL, - type TEXT NON NULL DEFAULT "isbn" COLLATE NOCASE, - val TEXT NON NULL COLLATE NOCASE, + book INTEGER NOT NULL, + type TEXT NOT NULL DEFAULT "isbn" COLLATE NOCASE, + val TEXT NOT NULL COLLATE NOCASE, UNIQUE(book, type) ); CREATE TABLE languages ( id INTEGER PRIMARY KEY, - lang_code TEXT NON NULL COLLATE NOCASE, + lang_code TEXT NOT NULL COLLATE NOCASE, UNIQUE(lang_code) ); CREATE TABLE library_id ( id INTEGER PRIMARY KEY, @@ -107,8 +107,8 @@ CREATE TABLE metadata_dirtied(id INTEGER PRIMARY KEY, book INTEGER NOT NULL, UNIQUE(book)); CREATE TABLE preferences(id INTEGER PRIMARY KEY, - key TEXT NON NULL, - val TEXT NON NULL, + key TEXT NOT NULL, + val TEXT NOT NULL, UNIQUE(key)); CREATE TABLE publishers ( id INTEGER PRIMARY KEY, name TEXT NOT NULL COLLATE NOCASE, diff --git a/src/calibre/db/schema_upgrades.py b/src/calibre/db/schema_upgrades.py index 0e6dfaa368..0569da9031 100644 --- a/src/calibre/db/schema_upgrades.py +++ b/src/calibre/db/schema_upgrades.py @@ -400,8 +400,8 @@ class SchemaUpgrade(object): script = ''' DROP TABLE IF EXISTS preferences; CREATE TABLE preferences(id INTEGER PRIMARY KEY, - key TEXT NON NULL, - val TEXT NON NULL, + key TEXT NOT NULL, + val TEXT NOT NULL, UNIQUE(key)); ''' self.db.execute(script) @@ -453,9 +453,9 @@ class SchemaUpgrade(object): script = ''' DROP TABLE IF EXISTS books_plugin_data; CREATE TABLE books_plugin_data(id INTEGER PRIMARY KEY, - book INTEGER NON NULL, - name TEXT NON NULL, - val TEXT NON NULL, + book INTEGER NOT NULL, + name TEXT NOT NULL, + val TEXT NOT NULL, UNIQUE(book,name)); DROP TRIGGER IF EXISTS books_delete_trg; CREATE TRIGGER books_delete_trg @@ -492,15 +492,15 @@ class SchemaUpgrade(object): DROP TABLE IF EXISTS identifiers; CREATE TABLE identifiers ( id INTEGER PRIMARY KEY, - book INTEGER NON NULL, - type TEXT NON NULL DEFAULT "isbn" COLLATE NOCASE, - val TEXT NON NULL COLLATE NOCASE, + book INTEGER NOT NULL, + type TEXT NOT NULL DEFAULT "isbn" COLLATE NOCASE, + val TEXT NOT NULL COLLATE NOCASE, UNIQUE(book, type) ); DROP TABLE IF EXISTS languages; CREATE TABLE languages ( id INTEGER PRIMARY KEY, - lang_code TEXT NON NULL COLLATE NOCASE, + lang_code TEXT NOT NULL COLLATE NOCASE, UNIQUE(lang_code) );