Create database tables

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 225e2ec613a97bb0751442bf6501430a5e9f9909..d63fd416406abe7b01d426189edfbf7e7d65d545 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -2,7 +2,7 @@
 
 import os
 from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
-    ForeignKey, DateCol, connectionForURI, sqlhub
+    ForeignKey, DateCol, connectionForURI, sqlhub, dberrors
 from .config import ml_conf
 
 try:
@@ -42,12 +42,6 @@ class Author(SQLObject):
     count = IntCol()
 
 
-class Genre(SQLObject):
-    name = StringCol()
-    title = UnicodeCol()
-    count = IntCol()
-
-
 class Book(SQLObject):
     author = ForeignKey('Author')
     genre = ForeignKey('Genre')
@@ -68,11 +62,29 @@ class Extension(SQLObject):
     count = IntCol()
 
 
+class Genre(SQLObject):
+    name = StringCol()
+    title = UnicodeCol()
+    count = IntCol()
+
+
 class Language(SQLObject):
     name = StringCol()
     count = IntCol()
 
 
+def init_db():
+    try:
+        Book.select()[0]
+    except IndexError:  # Table exists but is empty
+        return
+    except dberrors.Error:
+        for table in Author, Extension, Genre, Language, Book:
+            table.createTable()
+    else:
+        return
+
+
 if __name__ == '__main__':
     print "DB dirs:", db_dirs
     if db_uri:

diff --git a/scripts/ml-initdb.py b/scripts/ml-initdb.py
new file mode 100755 (executable)
index 0000000..79bbe43
--- /dev/null
+++ b/scripts/ml-initdb.py
@@ -0,0 +1,6 @@
+#! /usr/bin/env python
+
+from m_librarian.db import init_db
+
+if __name__ == '__main__':
+    init_db()

diff --git a/setup.py b/setup.py
index 5c00a5bd00d7c547f5149dc00aa6ef12bca9c868..1f102d3cfc378d7deeacfec125c3209b073004c5 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,6 @@ setup(name='m_librarian',
       ],
       packages=['m_librarian'],
       package_data={'m_librarian': ['data/*.txt', 'data/genres_*.glst']},
-      scripts=[],
+      scripts=['scripts/ml-initdb.py'],
       requires=['SQLObject'],
       )