arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Made raw queries portable to postgresql engine as well

Browse Source
This commit is contained in:
Tom Price
2015-03-03 02:44:16 +00:00
parent 472cc3f1bb
commit e1cef5bd87
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
RIGS/finance.py
View File

@@ -1,4 +1,5 @@
from django.core.urlresolvers import reverse_lazy
from django.db import connection
from django.http import Http404, HttpResponseRedirect
from django.views import generic
from django.shortcuts import get_object_or_404
@@ -14,12 +15,16 @@ class InvoiceIndex(generic.ListView):
def get_queryset(self):
# Manual query is the only way I have found to do this efficiently. Not ideal but needs must
query = self.model.objects.raw(
"SELECT *, "
"(SELECT SUM(ei.cost * ei.quantity) FROM RIGS_eventitem AS ei WHERE ei.event_id = i.event_id) AS cost, "
"(SELECT SUM(p.amount) FROM RIGS_payment AS p WHERE p.invoice_id = i.id) AS payments FROM RIGS_invoice as i "
"HAVING (cost - payments) > 0;"
)
if connection.vendor == 'postgresql':
sql = """SELECT * FROM (SELECT *,
(SELECT SUM (ei.cost * ei.quantity) FROM "RIGS_eventitem" AS ei where ei.event_id = i.event_id) AS cost,
(SELECT SUM(p.amount) FROM "RIGS_payment" AS p WHERE p.invoice_id = i.id) AS payments
FROM "RIGS_invoice" as i) AS sub
WHERE (cost - payments) > 0;"""
else:
sql = "SELECT *, (SELECT SUM(ei.cost * ei.quantity) FROM RIGS_eventitem AS ei WHERE ei.event_id = i.event_id) AS cost, (SELECT SUM(p.amount) FROM RIGS_payment AS p WHERE p.invoice_id = i.id) AS payments FROM RIGS_invoice as i HAVING (cost - payments) > 0;"
query = self.model.objects.raw(sql)
items = []

14
RIGS/models.py
View File

@@ -1,7 +1,7 @@
import hashlib
import datetime
from django.db import models
from django.db import models, connection
from django.contrib.auth.models import AbstractUser
from django.conf import settings
from django.utils.functional import cached_property
@@ -248,7 +248,11 @@ class Event(models.Model, RevisionMixin):
@property
def sum_total(self):
# Manual querying is required for efficiency whilst maintaining floating point arithmetic
total = self.items.raw("SELECT id, SUM(quantity * cost) AS sum_total FROM RIGS_eventitem WHERE event_id=%i" % self.id)[0]
if connection.vendor == 'postgresql':
sql = "SELECT SUM(quantity * cost) AS sum_total FROM \"RIGS_eventitem\" WHERE event_id=%i" % self.id
else:
sql = "SELECT id, SUM(quantity * cost) AS sum_total FROM RIGS_eventitem WHERE event_id=%i" % self.id
total = self.items.raw(sql)[0]
if total.sum_total:
return total.sum_total
return 0.0
@@ -331,7 +335,11 @@ class Invoice(models.Model):
@property
def payment_total(self):
# Manual querying is required for efficiency whilst maintaining floating point arithmetic
total = self.payment_set.raw("SELECT id, SUM(amount) AS total FROM RIGS_payment WHERE invoice_id=%i" % self.id)[0]
if connection.vendor == 'postgresql':
sql = "SELECT SUM(amount) AS total FROM \"RIGS_payment\" WHERE invoice_id=%i" % self.id
else:
sql = "SELECT id, SUM(amount) AS total FROM RIGS_payment WHERE invoice_id=%i" % self.id
total = self.payment_set.raw(sql)[0]
if total.total:
return total.total
return 0.0