ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update for sqlalchemy v2

Browse Source
This commit is contained in:
Damien De Paoli
2025-10-04 23:23:39 +10:00
parent 81ebf6fa01
commit 2f5c6ec949
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
job.py
View File

@@ -3,7 +3,7 @@ from flask_wtf import FlaskForm
from flask import request, render_template, redirect, make_response, jsonify, url_for from flask import request, render_template, redirect, make_response, jsonify, url_for
from settings import Settings from settings import Settings
from main import db, app, ma from main import db, app, ma
from sqlalchemy import Sequence, func from sqlalchemy import Sequence, func, select
from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.exc import SQLAlchemyError
from datetime import datetime, timedelta from datetime import datetime, timedelta
import pytz import pytz
@@ -280,7 +280,8 @@ def joblog_search():
from sqlalchemy import text from sqlalchemy import text
eid=request.form['eid'] 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() 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 # turn DB output into json and return it to the f/e