Update to use SQLite

GeekMasher · web-flow · commit f56d4618f561 · 2021-10-07T10:14:19.000Z
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+
+*.db
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
diff --git a/Pipfile b/Pipfile
@@ -5,7 +5,6 @@ name = "pypi"
 
 [packages]
 flask = "*"
-flask-sqlalchemy = "*"
 
 [dev-packages]
 
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/server/__main__.py b/server/__main__.py
@@ -1,7 +1,7 @@
 import sys
 sys.path.append('.')
 
-from server.webapp import flaskapp, db, TEMPLATES
+from server.webapp import flaskapp, database, cursor, TEMPLATES
 from server.models import *
 from server.routes import *
 
@@ -15,11 +15,21 @@
 
 
 if __name__ == "__main__":
+    cursor.execute(
+        '''CREATE TABLE books (name text, author text, read text)'''
+    )
+
     for bookname, bookauthor, hasread in default_books:
-        if not Book.query.filter_by(name=bookname).first():
-            book = Book(name=bookname, author=bookauthor, read=hasread)
-            db.session.add(book)
-            db.session.commit()
+        try:
+            cursor.execute(
+                'INSERT INTO books values (?, ?, ?)',
+                (bookname, bookauthor, 'true' if hasread else 'false')
+            )
+
+        except Exception as err:
+            print(f'[!] Error Occurred: {err}')
 
-    db.create_all()
     flaskapp.run('0.0.0.0', debug=True)
+    
+    cursor.close()
+    database.close()
diff --git a/server/models/books.py b/server/models/books.py
@@ -1,10 +1,8 @@
 
-from server.webapp import db
+from dataclasses import dataclass
 
-
-class Book(db.Model):
-    id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(128), unique=False, nullable=False)
-    author = db.Column(db.String(128), unique=False, nullable=False)
-
-    read = db.Column(db.Boolean(), unique=False, nullable=False)
+@dataclass
+class Book():
+    name: str
+    author: str
+    read: bool
diff --git a/server/routes.py b/server/routes.py
@@ -1,7 +1,7 @@
 
 from flask import request, render_template, make_response
 
-from server.webapp import flaskapp, db
+from server.webapp import flaskapp, cursor
 from server.models import Book
 
 
@@ -12,20 +12,23 @@ def index():
     read = bool(request.args.get('read'))
 
     if name:
-        result = db.engine.execute(
-            "SELECT * FROM Book WHERE name LIKE '%" + name + "%'"
+        cursor.execute(
+            "SELECT * FROM books WHERE name LIKE '%" + name + "%'"
         )
-        books = [row for row in result]
+        books = [Book(*row) for row in cursor]
         if len(books) == 0:
             return make_response(f"Search Result not found: {name}", 404)
+
     elif author:
-        result = db.engine.execute(
-            "SELECT * FROM Book WHERE author LIKE '%" + author + "%'"
+        cursor.execute(
+            "SELECT * FROM books WHERE author LIKE '%" + author + "%'"
         )
-        books = [row for row in result]
+        books = [Book(*row) for row in cursor]
         if len(books) == 0:
             return make_response(f"Search Result not found: {author}", 404)
+
     else:
-        books = Book.query.all()
-    
+        cursor.execute("SELECT name, author, read FROM books")
+        books = [Book(*row) for row in cursor]
+
     return render_template('books.html', books=books)
diff --git a/server/webapp.py b/server/webapp.py
@@ -1,13 +1,16 @@
 import os
+import sqlite3
 
 from flask import Flask
-from flask_sqlalchemy import SQLAlchemy
+
 
 ROOT = os.path.dirname(os.path.abspath(os.path.dirname(__file__)))
 TEMPLATES = os.path.join(ROOT, 'templates')
 
 flaskapp = Flask("BookStore", template_folder=TEMPLATES)
-flaskapp.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLITE_URI', 'sqlite:////tmp/test.db')
 flaskapp.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
-db = SQLAlchemy(flaskapp)
+database_uri = os.environ.get('SQLITE_URI', ':memory:')
+
+database = sqlite3.connect(database_uri, check_same_thread=False)
+cursor = database.cursor()
