From ee08410d892e2facfbe8469a78a661c3e366ff8c Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Thu, 24 Dec 2015 17:10:17 +0300 Subject: [PATCH] Fix Db schema Books and authors, Books and genres are linked with many-to-many relations: there are lists of authors and genres for every book. --- m_librarian/db.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/m_librarian/db.py b/m_librarian/db.py index 7cd53a1..6888ab8 100755 --- a/m_librarian/db.py +++ b/m_librarian/db.py @@ -6,7 +6,8 @@ __all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language', import os from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \ - ForeignKey, DateCol, connectionForURI, sqlhub, SQLObjectNotFound, dberrors + ForeignKey, DateCol, RelatedJoin, \ + connectionForURI, sqlhub, SQLObjectNotFound, dberrors from .config import ml_conf try: @@ -45,11 +46,12 @@ sqlhub.processConnection = connectionForURI(db_uri) class Author(SQLObject): name = UnicodeCol(unique=True) count = IntCol() + books = RelatedJoin('Book', otherColumn='book_id') class Book(SQLObject): - author = ForeignKey('Author') - genre = ForeignKey('Genre') + authors = RelatedJoin('Author') + genres = RelatedJoin('Genre') title = UnicodeCol() series = UnicodeCol() ser_no = IntCol() @@ -58,7 +60,7 @@ class Book(SQLObject): size = IntCol() lib_id = StringCol() deleted = BoolCol() - ext = ForeignKey('Extension') + extension = ForeignKey('Extension') date = DateCol() language = ForeignKey('Language') @@ -72,6 +74,7 @@ class Genre(SQLObject): name = StringCol(unique=True) title = UnicodeCol() count = IntCol() + books = RelatedJoin('Book', otherColumn='book_id') class Language(SQLObject): -- 2.39.2