Address SQLAlchemy deprecation warnings

smsearcy · Jun 26, 2023 · 6aad35d · 6aad35d
1 parent cebfd78
commit 6aad35d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/meshinfo/views/node.py b/meshinfo/views/node.py
@@ -32,7 +32,7 @@ def node_detail(request: Request):
 
     query = (
         dbsession.query(Link)
-        .options(joinedload(Link.destination).load_only("display_name"))
+        .options(joinedload(Link.destination).load_only(Node.display_name))
         .filter(
             Link.source_id == node.id,
             Link.status != LinkStatus.INACTIVE,
@@ -90,7 +90,7 @@ def node_preview(request: Request):
 
     query = (
         dbsession.query(Link)
-        .options(joinedload(Link.destination).load_only("display_name"))
+        .options(joinedload(Link.destination).load_only(Node.display_name))
         .filter(
             Link.source_id == node.id,
             Link.status == LinkStatus.CURRENT,
@@ -99,7 +99,7 @@ def node_preview(request: Request):
     current_links = query.all()
     query = (
         dbsession.query(Link)
-        .options(joinedload(Link.destination).load_only("display_name"))
+        .options(joinedload(Link.destination).load_only(Node.display_name))
         .filter(
             Link.source_id == node.id,
             Link.status == LinkStatus.RECENT,
@@ -126,7 +126,11 @@ def node_graphs(request: Request):
     graph = request.matchdict["name"]
     dbsession: Session = request.dbsession
 
-    node = dbsession.query(Node).options(load_only("display_name", "id")).get(node_id)
+    node = (
+        dbsession.query(Node)
+        .options(load_only(Node.display_name, Node.id))
+        .get(node_id)
+    )
 
     return {
         "node": node,