Skip to content

Commit 1bc6c7c

Browse files
committed
Fixing sql issues
1 parent 22c5038 commit 1bc6c7c

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

packet/member.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from collections import namedtuple
22
from logging import getLogger
33

4-
from sqlalchemy import exc
4+
from sqlalchemy import exc, text
55

66
from .models import db, REQUIRED_MISC_SIGNATURES
77
from .packet import get_number_required, get_misc_signatures
@@ -114,10 +114,10 @@ def query_signed_intromember(member):
114114
:return: list of results matching the query
115115
"""
116116

117-
s = """
118-
SELECT DISTINCT packet.freshman_username AS username, signature_fresh.signed AS signed FROM packet
119-
INNER JOIN signature_fresh ON packet.id = signature_fresh.packet_id
120-
WHERE signature_fresh.freshman_username = ':member';"""
117+
s = text(
118+
"SELECT DISTINCT packet.freshman_username AS username, signature_fresh.signed AS signed FROM packet "
119+
"INNER JOIN signature_fresh ON packet.id = signature_fresh.packet_id "
120+
"WHERE signature_fresh.freshman_username = :member;")
121121
try:
122122
return db.engine.execute(s, member=member)
123123

@@ -132,10 +132,9 @@ def query_signed_upperclassman(member):
132132
:return: list of results matching the query
133133
"""
134134

135-
s = """
136-
SELECT DISTINCT packet.freshman_username AS username, signature_upper.signed AS signed FROM packet
137-
INNER JOIN signature_upper ON packet.id = signature_upper.packet_id
138-
WHERE signature_upper.member = ':member';"""
135+
s = text("SELECT DISTINCT packet.freshman_username AS username, signature_upper.signed AS signed FROM packet "
136+
"INNER JOIN signature_upper ON packet.id = signature_upper.packet_id "
137+
"WHERE signature_upper.member = :member;")
139138

140139
try:
141140
return db.engine.execute(s, member=member)
@@ -151,10 +150,9 @@ def query_signed_alumni(member):
151150
:return: list of results matching the query
152151
"""
153152

154-
s = """
155-
SELECT DISTINCT packet.freshman_username AS username, signature_misc.member AS signed
156-
FROM packet LEFT OUTER JOIN signature_misc ON packet.id = signature_misc.packet_id
157-
WHERE signature_misc.member = ':member' OR signature_misc.member ISNULL;"""
153+
s = text("SELECT DISTINCT packet.freshman_username AS username, signature_misc.member AS signed FROM packet "
154+
"LEFT OUTER JOIN signature_misc ON packet.id = signature_misc.packet_id "
155+
"WHERE signature_misc.member = :member OR signature_misc.member ISNULL;")
158156

159157
try:
160158
return db.engine.execute(s, member=member)

0 commit comments

Comments
 (0)