diff --git a/.DS_Store b/.DS_Store index 23147fa..254df95 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app/__init__.py b/app/__init__.py index 981b170..4ba42bd 100755 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,6 +4,8 @@ from marshmallow import Schema, fields, ValidationError, pre_load import os import click from werkzeug.utils import secure_filename +from sqlalchemy.dialects import registry +registry.register("rqlite.pyrqlite", "sqlalchemy_rqlite.pyrqlite", "dialect") basedir = os.path.abspath(os.path.dirname(__file__)) @@ -17,6 +19,7 @@ app.config['SECRET_KEY'] = 'super secret key' #app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/mydatabase.db' app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER app.config['SQLALCHEMY_DATABASE_URI'] = 'rqlite+pyrqlite://localhost:4001/' +#app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'mydatabase.db') db = SQLAlchemy(app) app.config.from_object(__name__) diff --git a/app/models.py b/app/models.py index 64061c9..723817b 100755 --- a/app/models.py +++ b/app/models.py @@ -6,23 +6,17 @@ authors = db.Table('books_authors', db.Column('author_id', db.Integer, db.ForeignKey('authors.id'), primary_key=True) ) -tags = db.Table('books_tags', - db.Column('book_id', db.Integer, db.ForeignKey('books.id'), primary_key=True), - db.Column('tag_id', db.Integer, db.ForeignKey('tags.id'), primary_key=True) -) - class Book(db.Model): __tablename__ = 'books' + id = db.Column(db.Integer, primary_key = True) title = db.Column(db.String(255)) file = db.Column(db.String(255)) cover = db.Column(db.String(255)) fileformat = db.Column(db.String(255)) category = db.Column(db.String(255)) - authors = db.relationship('Author', secondary=authors, lazy='subquery', - backref=db.backref('books', lazy=True)) - tags = db.relationship('Tag', secondary=tags, lazy='subquery', - backref=db.backref('books', lazy=True)) + authors = db.relationship('Author', secondary=authors,cascade="delete", lazy='subquery', + backref=db.backref('books', lazy=True),passive_deletes=True) scapeX = db.Column(db.Numeric(10,2)) scapeY = db.Column(db.Numeric(10,2)) @@ -45,19 +39,13 @@ class Book(db.Model): class Author(db.Model): __tablename__ = 'authors' + id = db.Column(db.Integer(), primary_key=True) author_name = db.Column(db.String(50)) def __init__(self, author_name): self.author_name = author_name -class Tag(db.Model): - __tablename__ = 'tags' - id = db.Column(db.Integer(), primary_key=True) - tag = db.Column(db.String(50)) - - def __init__(self, tag): - self.tag = tag class AuthorSchema(Schema): id = fields.Int(dump_only=True) diff --git a/app/views.py b/app/views.py index 0681b37..c05bb8d 100755 --- a/app/views.py +++ b/app/views.py @@ -92,7 +92,7 @@ def remove_book_by_id(id): book_to_edit = Book.query.filter_by(id=id).first() title = book_to_edit.title Book.query.filter_by(id=id).delete() - #author_table = Author.query.filter_by(books_id=book_to_edit.id).delete() + author_table = Author.query.filter_by(book_id=book_to_edit.id).delete() db.session.commit() flash("%s deleted from library" % (title)) return redirect(url_for('show_books')) @@ -106,25 +106,39 @@ def edit_book_by_id(id): if user_form.validate_on_submit(): # check if the post request has the file part title = user_form.title.data # You could also have used request.form['name'] - authors = user_form.author.data # You could also have used request.form['email'] + input_authors = user_form.author.data # You could also have used request.form['email'] category = user_form.category.data # save user to database #book = Book(title, author, filename, cover, file_extension) - db.session.commit() book = Book.query.filter_by(id=id).first() + book.title = title book.category = category - book.authors= [] - db.session.commit() - for author in authors: - author_name = author.get("author_name") - if author_name: - a = db.session.query(Author).filter_by(author_name=author_name).first() - if a == None: - a = Author(author_name=author_name) - db.session.add(a) - book.authors.append(a) + + if(len(book.authors)==1): + book.authors[0].author_name = input_authors[0].get("author_name") + + #book.authors.clear() + for i, author in enumerate(input_authors): + if i > 0: + author_name = author.get("author_name") + if author_name: + a = db.session.query(Author).filter_by(author_name=author_name).first() + if a == None: + a = Author(author_name=author_name) + db.session.add(a) + book.authors.append(a) + else: + book.authors.clear() + for i, author in enumerate(input_authors): + author_name = author.get("author_name") + if author_name: + a = db.session.query(Author).filter_by(author_name=author_name).first() + if a == None: + a = Author(author_name=author_name) + db.session.add(a) + book.authors.append(a) db.session.commit() flash("%s updated" % (title)) return redirect(url_for('show_books')) diff --git a/test.py b/test.py new file mode 100644 index 0000000..64c780b --- /dev/null +++ b/test.py @@ -0,0 +1,58 @@ +from sqlalchemy import create_engine +from sqlalchemy import Table, Column, Integer, String, ForeignKey, Sequence +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import sessionmaker, relationship + + +Base = declarative_base() + + +teachers_lessons = Table( + "teachers_lessons", + Base.metadata, + Column("fk_teacher", Integer, ForeignKey("teachers.id")), + Column("fk_lesson", Integer, ForeignKey("lessons.id")), +) + + +class Teacher(Base): + __tablename__ = "teachers" + + id = Column("id", Integer, Sequence("teachers_id_seq"), primary_key=True) + name = Column("name", String(50), nullable=False) + + lessons = relationship( + "Lesson", + backref="teachers", + secondary=teachers_lessons + ) + + +class Lesson(Base): + __tablename__ = "lessons" + + id = Column("id", Integer, Sequence("lessons_id_seq"), primary_key=True) + name = Column("name", String(50), nullable=False) + + +engine = create_engine('rqlite+pyrqlite://localhost:4001/', echo=True) +Base.metadata.create_all(engine) +Session = sessionmaker(bind=engine) + + +if __name__ == "__main__": + s = Session() + + t1 = Teacher(name="NEWNEW") + t1.lessons = [ + Lesson(name="fpro"), + Lesson(name="math") + ] + s.add(t1) + s.commit() + + t2 = s.query(Teacher).filter_by(name='NEWNEW').first() + t2.lessons.clear() + s.commit() + + \ No newline at end of file