From 7eb2eaf36f1c60bb32d695588f92e4ff2e555d2f Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Mon, 25 Apr 2022 15:06:24 +0100 Subject: [PATCH] azure_cdn: use subgroups, attempt 3 --- app/terraform/proxy/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/terraform/proxy/__init__.py b/app/terraform/proxy/__init__.py index 3deed73..55ecc3e 100644 --- a/app/terraform/proxy/__init__.py +++ b/app/terraform/proxy/__init__.py @@ -1,6 +1,8 @@ import datetime from collections import defaultdict +from sqlalchemy import text + from app import app from app.extensions import db from app.models.base import Group @@ -11,13 +13,13 @@ from app.terraform import BaseAutomation class ProxyAutomation(BaseAutomation): def get_subgroups(self): conn = db.engine.connect() - result = conn.execute(""" + result = conn.execute(text(""" SELECT origin.group_id, proxy.psg, COUNT(proxy.id) FROM proxy, origin WHERE proxy.origin_id = origin.id AND proxy.destroyed IS NULL AND proxy.provider = :provider GROUP BY origin.group_id, proxy.psg; - """, provider=self.provider) + """), provider=self.provider) subgroups = defaultdict(lambda: defaultdict(lambda: 0)) for row in result: subgroups[row[0]][row[1]] = row[2]