More indices

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 98e541e95732378344f2e6f47b6b5f2cb1af2f3c..93787c712d598d409f3eaa81e1ddd7854478bfe8 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 
 __all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
+           'AuthorBook', 'BookGenre',
            'init_db', 'insert_name', 'update_counters',
            ]
 
@@ -54,13 +55,29 @@ if connection.dbName == 'sqlite':
 class Author(SQLObject):
     name = UnicodeCol(unique=True)
     count = IntCol()
-    count_idx = DatabaseIndex('count')
-    books = RelatedJoin('Book', otherColumn='book_id')
+    books = RelatedJoin('Book', otherColumn='book_id',
+                        intermediateTable='author_book',
+                        createRelatedTable=False)
+    count_idx = DatabaseIndex(count)
+
+
+class AuthorBook(SQLObject):
+    class sqlmeta:
+        table = "author_book"
+    author = ForeignKey('Author', notNull=True, cascade=True)
+    book = ForeignKey('Book', notNull=True, cascade=True)
+    author_idx = DatabaseIndex(author)
+    book_idx = DatabaseIndex(book)
+    main_idx = DatabaseIndex(author, book, unique=True)
 
 
 class Book(SQLObject):
-    authors = RelatedJoin('Author')
-    genres = RelatedJoin('Genre')
+    authors = RelatedJoin('Author',
+                          intermediateTable='author_book',
+                          createRelatedTable=False)
+    genres = RelatedJoin('Genre',
+                         intermediateTable='book_genre',
+                         createRelatedTable=False)
     title = UnicodeCol()
     series = UnicodeCol()
     ser_no = IntCol()
@@ -72,27 +89,44 @@ class Book(SQLObject):
     extension = ForeignKey('Extension')
     date = DateCol()
     language = ForeignKey('Language')
-    archive_file_idx = DatabaseIndex('archive', 'file', unique=True)
+    title_idx = DatabaseIndex(title)
+    series_idx = DatabaseIndex(series)
+    archive_file_idx = DatabaseIndex(archive, file, unique=True)
+    extension_idx = DatabaseIndex(extension)
+    language_idx = DatabaseIndex(language)
+
+
+class BookGenre(SQLObject):
+    class sqlmeta:
+        table = "book_genre"
+    book = ForeignKey('Book', notNull=True, cascade=True)
+    genre = ForeignKey('Genre', notNull=True, cascade=True)
+    book_idx = DatabaseIndex(book)
+    genre_idx = DatabaseIndex(genre)
+    main_idx = DatabaseIndex(book, genre, unique=True)
 
 
 class Extension(SQLObject):
     name = StringCol(unique=True)
     count = IntCol()
-    count_idx = DatabaseIndex('count')
+    count_idx = DatabaseIndex(count)
 
 
 class Genre(SQLObject):
     name = StringCol(unique=True)
     title = UnicodeCol()
     count = IntCol()
-    count_idx = DatabaseIndex('count')
-    books = RelatedJoin('Book', otherColumn='book_id')
+    books = RelatedJoin('Book', otherColumn='book_id',
+                        intermediateTable='book_genre',
+                        createRelatedTable=False)
+    title_idx = DatabaseIndex(title)
+    count_idx = DatabaseIndex(count)
 
 
 class Language(SQLObject):
     name = StringCol(unique=True)
     count = IntCol()
-    count_idx = DatabaseIndex('count')
+    count_idx = DatabaseIndex(count)
 
 
 def init_db():
@@ -101,7 +135,8 @@ def init_db():
     except IndexError:  # Table exists but is empty
         return
     except dberrors.Error:
-        for table in Author, Extension, Genre, Language, Book:
+        for table in Author, Extension, Genre, Language, Book, \
+                AuthorBook, BookGenre:
             table.createTable()
     else:
         return
@@ -114,6 +149,20 @@ def insert_name(table, name, **kw):
         return table(name=name, count=0, **kw)
 
 
+def update_counters():
+    for author in Author.select():
+        author.count = len(author.books)
+
+    for ext in Extension.select():
+        ext.count = Book.select(Book.q.extension == ext.name).count()
+
+    for genre in Genre.select():
+        genre.count = len(genre.books)
+
+    for language in Language.select():
+        language.count = Book.select(Book.q.language == language.name).count()
+
+
 def test():
     print "DB dirs:", db_dirs
     if db_uri: