Split name column into 3

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 93787c712d598d409f3eaa81e1ddd7854478bfe8..6e08204acfcdac30da1ec9790b2132d9e7d8df14 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -53,11 +53,14 @@ if connection.dbName == 'sqlite':
 
 
 class Author(SQLObject):
-    name = UnicodeCol(unique=True)
-    count = IntCol()
+    surname = UnicodeCol(notNull=True)
+    name = UnicodeCol(notNull=True)
+    misc_name = UnicodeCol(notNull=True)
+    count = IntCol(notNull=True)
     books = RelatedJoin('Book', otherColumn='book_id',
                         intermediateTable='author_book',
                         createRelatedTable=False)
+    full_name_idx = DatabaseIndex(surname, name, misc_name, unique=True)
     count_idx = DatabaseIndex(count)
 
 
@@ -78,21 +81,26 @@ class Book(SQLObject):
     genres = RelatedJoin('Genre',
                          intermediateTable='book_genre',
                          createRelatedTable=False)
-    title = UnicodeCol()
-    series = UnicodeCol()
+    title = UnicodeCol(notNull=True)
+    series = UnicodeCol(notNull=True)
     ser_no = IntCol()
-    archive = StringCol()
-    file = StringCol()
-    size = IntCol()
-    lib_id = StringCol()
-    deleted = BoolCol()
-    extension = ForeignKey('Extension')
-    date = DateCol()
+    archive = StringCol(notNull=True)
+    file = StringCol(notNull=True)
+    size = IntCol(notNull=True)
+    lib_id = StringCol(notNull=True)
+    deleted = BoolCol(notNull=True)
+    extension = ForeignKey('Extension', notNull=True)
+    date = DateCol(notNull=True)
     language = ForeignKey('Language')
     title_idx = DatabaseIndex(title)
     series_idx = DatabaseIndex(series)
+    ser_no_idx = DatabaseIndex(ser_no)
     archive_file_idx = DatabaseIndex(archive, file, unique=True)
+    file_idx = DatabaseIndex(file)
+    size_idx = DatabaseIndex(size)
+    deleted_idx = DatabaseIndex(deleted)
     extension_idx = DatabaseIndex(extension)
+    date_idx = DatabaseIndex(date)
     language_idx = DatabaseIndex(language)
 
 
@@ -107,15 +115,15 @@ class BookGenre(SQLObject):
 
 
 class Extension(SQLObject):
-    name = StringCol(unique=True)
-    count = IntCol()
+    name = StringCol(notNull=True, unique=True)
+    count = IntCol(notNull=True)
     count_idx = DatabaseIndex(count)
 
 
 class Genre(SQLObject):
-    name = StringCol(unique=True)
-    title = UnicodeCol()
-    count = IntCol()
+    name = StringCol(notNull=True, unique=True)
+    title = UnicodeCol(notNull=True)
+    count = IntCol(notNull=True)
     books = RelatedJoin('Book', otherColumn='book_id',
                         intermediateTable='book_genre',
                         createRelatedTable=False)
@@ -124,8 +132,8 @@ class Genre(SQLObject):
 
 
 class Language(SQLObject):
-    name = StringCol(unique=True)
-    count = IntCol()
+    name = StringCol(notNull=True, unique=True)
+    count = IntCol(notNull=True)
     count_idx = DatabaseIndex(count)