Optimise SQL queries

[cheatdb.git] / app / blueprints / homepage / __init__.py

diff --git a/app/blueprints/homepage/__init__.py b/app/blueprints/homepage/__init__.py
index df638df77d127bba35db8a14f37bcfd3a42a4b38..5df612f738bb175dae20111b666a5573db39f737 100644 (file)
--- a/app/blueprints/homepage/__init__.py
+++ b/app/blueprints/homepage/__init__.py
@@ -4,17 +4,23 @@ bp = Blueprint("homepage", __name__)
 
 from app.models import *
 import flask_menu as menu
+from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import func
 
 @bp.route("/")
 @menu.register_menu(bp, ".", "Home")
 def home():
+       def join(query):
+               return query.options( \
+                       joinedload(Package.license), \
+                       joinedload(Package.media_license))
+
        query   = Package.query.filter_by(approved=True, soft_deleted=False)
        count   = query.count()
-       new     = query.order_by(db.desc(Package.created_at)).limit(8).all()
-       pop_mod = query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score)).limit(8).all()
-       pop_gam = query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score)).limit(4).all()
-       pop_txp = query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score)).limit(4).all()
+       new     = join(query.order_by(db.desc(Package.created_at))).limit(8).all()
+       pop_mod = join(query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score))).limit(8).all()
+       pop_gam = join(query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score))).limit(4).all()
+       pop_txp = join(query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score))).limit(4).all()
        downloads_result = db.session.query(func.sum(PackageRelease.downloads)).one_or_none()
        downloads = 0 if not downloads_result or not downloads_result[0] else downloads_result[0]
        return render_template("index.html", count=count, downloads=downloads, \