From 2f5c6ec9496e3d22a79ceca11a13575e542c3177 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sat, 4 Oct 2025 23:23:39 +1000 Subject: [PATCH] update for sqlalchemy v2 --- job.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/job.py b/job.py index ea8860a..127c2a7 100644 --- a/job.py +++ b/job.py @@ -3,7 +3,7 @@ from flask_wtf import FlaskForm from flask import request, render_template, redirect, make_response, jsonify, url_for from settings import Settings from main import db, app, ma -from sqlalchemy import Sequence, func +from sqlalchemy import Sequence, func, select from sqlalchemy.exc import SQLAlchemyError from datetime import datetime, timedelta import pytz @@ -280,7 +280,8 @@ def joblog_search(): from sqlalchemy import text eid=request.form['eid'] - ent=Entry.query.get(eid) + stmt = select(Entry).where(Entry.id == eid) + ent = db.session.scalars(stmt).one_or_none() logs=Joblog.query.join(Job).filter(Joblog.log.ilike(text(f"'%%{ent.name}%%'"))).with_entities(Joblog.log, Job.id, Job.name, Job.state, Joblog.log_date).all() # turn DB output into json and return it to the f/e