[dak/master] silence one more SQLAlchemy warning about textual SQL expressions
---
daklib/rm.py | 9 +++++----
daklib/utils.py | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/daklib/rm.py b/daklib/rm.py
index 1e523d2e..f50c13a7 100644
--- a/daklib/rm.py
+++ b/daklib/rm.py
@@ -42,6 +42,7 @@
import commands
import apt_pkg
import fcntl
+import sqlalchemy.sql as sql
from re import sub
from collections import defaultdict
from regexes import re_build_dep_arch
@@ -115,13 +116,13 @@ class ReverseDependencyChecker(object):
params['arch_id'] = suite_archs2id[architecture]
- statement = '''
+ statement = sql.text('''
SELECT b.package,
(SELECT bmd.value FROM binaries_metadata bmd WHERE bmd.bin_id = b.id AND bmd.key_id = :metakey_d_id) AS depends,
(SELECT bmp.value FROM binaries_metadata bmp WHERE bmp.bin_id = b.id AND bmp.key_id = :metakey_p_id) AS provides
FROM binaries b
JOIN bin_associations ba ON b.id = ba.bin AND ba.suite = :suite_id
- WHERE b.architecture = :arch_id OR b.architecture = :arch_all_id'''
+ WHERE b.architecture = :arch_id OR b.architecture = :arch_all_id''')
query = session.query('package', 'depends', 'provides'). \
from_statement(statement).params(params)
for package, depends, provides in query:
@@ -155,7 +156,7 @@ class ReverseDependencyChecker(object):
'suite_id': suite_id,
'metakey_ids': (metakey_bd.key_id, metakey_bdi.key_id),
}
- statement = '''
+ statement = sql.text('''
SELECT s.source, string_agg(sm.value, ', ') as build_dep
FROM source s
JOIN source_metadata sm ON s.id = sm.src_id
@@ -163,7 +164,7 @@ class ReverseDependencyChecker(object):
(SELECT source FROM src_associations
WHERE suite = :suite_id)
AND sm.key_id in :metakey_ids
- GROUP BY s.id, s.source'''
+ GROUP BY s.id, s.source''')
query = session.query('source', 'build_dep').from_statement(statement). \
params(params)
for source, build_dep in query:
diff --git a/daklib/utils.py b/daklib/utils.py
index 83ece9a8..7e99f847 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -32,6 +32,7 @@ import grp
import select
import socket
import shutil
+import sqlalchemy.sql as sql
import sys
import tempfile
import traceback
@@ -1189,7 +1190,7 @@ def check_reverse_depends(removals, suite, arches=None, session=None, cruft=Fals
virtual_packages = {}
params['arch_id'] = get_architecture(architecture, session).arch_id
- statement = '''
+ statement = sql.text('''
SELECT b.package, s.source, c.name as component,
(SELECT bmd.value FROM binaries_metadata bmd WHERE bmd.bin_id = b.id AND bmd.key_id = :metakey_d_id) AS depends,
(SELECT bmp.value FROM binaries_metadata bmp WHERE bmp.bin_id = b.id AND bmp.key_id = :metakey_p_id) AS provides
@@ -1198,7 +1199,7 @@ def check_reverse_depends(removals, suite, arches=None, session=None, cruft=Fals
JOIN source s ON b.source = s.id
JOIN files_archive_map af ON b.file = af.file_id
JOIN component c ON af.component_id = c.id
- WHERE b.architecture = :arch_id'''
+ WHERE b.architecture = :arch_id''')
query = session.query('package', 'source', 'component', 'depends', 'provides'). \
from_statement(statement).params(params)
for package, source, component, depends, provides in query:
@@ -1286,7 +1287,7 @@ def check_reverse_depends(removals, suite, arches=None, session=None, cruft=Fals
'suite_id': dbsuite.suite_id,
'metakey_ids': metakey_ids,
}
- statement = '''
+ statement = sql.text('''
SELECT s.source, string_agg(sm.value, ', ') as build_dep
FROM source s
JOIN source_metadata sm ON s.id = sm.src_id
@@ -1294,7 +1295,7 @@ def check_reverse_depends(removals, suite, arches=None, session=None, cruft=Fals
(SELECT src FROM newest_src_association
WHERE suite = :suite_id)
AND sm.key_id in :metakey_ids
- GROUP BY s.id, s.source'''
+ GROUP BY s.id, s.source''')
query = session.query('source', 'build_dep').from_statement(statement). \
params(params)
for source, build_dep in query:
--
2.11.0
Reply to: