imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Applied f-string to compose the SQL statements in the views of the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-07-16 23:35:10 +08:00
parent 1f80f8a4d6
commit ba119c4ed0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
accounting/views/__init__.py
View File

@ -215,9 +215,9 @@ ORDER BY
period.end, period.end,
current_subject.code + "%", current_subject.code + "%",
current_subject.code + "%"]) current_subject.code + "%"])
select_balance_before = """SELECT select_balance_before = f"""SELECT
SUM(CASE WHEN is_credit THEN 1 ELSE -1 END * amount) AS amount SUM(CASE WHEN is_credit THEN 1 ELSE -1 END * amount) AS amount
FROM (%s) AS b""" % select_records FROM ({select_records})"""
sql_balance_before = SqlQuery( sql_balance_before = SqlQuery(
select_balance_before, select_balance_before,
[data_start, [data_start,
@ -293,8 +293,9 @@ def cash_summary(request, subject_code):
month_definition = None month_definition = None
# The SQL query # The SQL query
if current_subject.code == "0": if current_subject.code == "0":
records = list(RecordSummary.objects.raw("""SELECT records = list(RecordSummary.objects.raw(
""" + month_definition + """ AS month, f"""SELECT
{month_definition} AS month,
SUM(CASE WHEN r.is_credit THEN r.amount ELSE 0 END) AS credit_amount, SUM(CASE WHEN r.is_credit THEN r.amount ELSE 0 END) AS credit_amount,
SUM(CASE WHEN r.is_credit THEN 0 ELSE r.amount END) AS debit_amount SUM(CASE WHEN r.is_credit THEN 0 ELSE r.amount END) AS debit_amount
FROM accounting_records AS r FROM accounting_records AS r
@ -320,8 +321,8 @@ GROUP BY month
ORDER BY month""")) ORDER BY month"""))
else: else:
records = list(RecordSummary.objects.raw( records = list(RecordSummary.objects.raw(
"""SELECT f"""SELECT
""" + month_definition + """ AS month, {month_definition} AS month,
SUM(CASE WHEN r.is_credit THEN r.amount ELSE 0 END) AS credit_amount, SUM(CASE WHEN r.is_credit THEN r.amount ELSE 0 END) AS credit_amount,
SUM(CASE WHEN r.is_credit THEN 0 ELSE r.amount END) AS debit_amount SUM(CASE WHEN r.is_credit THEN 0 ELSE r.amount END) AS debit_amount
FROM accounting_records AS r FROM accounting_records AS r
@ -414,9 +415,9 @@ def ledger(request, subject_code, period_spec):
select_records, select_records,
[period.start, period.end, current_subject.code + "%"])) [period.start, period.end, current_subject.code + "%"]))
if re.match("^[1-3]", current_subject.code) is not None: if re.match("^[1-3]", current_subject.code) is not None:
select_balance_before = """SELECT select_balance_before = f"""SELECT
SUM(CASE WHEN is_credit THEN -1 ELSE 1 END * amount) SUM(CASE WHEN is_credit THEN -1 ELSE 1 END * amount)
FROM (%s)""" % select_records FROM ({select_records})"""
with connection.cursor() as cursor: with connection.cursor() as cursor:
cursor.execute( cursor.execute(
select_balance_before, select_balance_before,