* Fixes issue #6 BUG 'queuemonth' and 'usermonth' reports did not work in

sqlite. Thanks to David Clymer for the patch.
This commit is contained in:
Ross Poulton 2008-08-20 10:43:46 +00:00
parent b5cdea2fab
commit 5f9b85fbbf

View File

@ -461,21 +461,27 @@ def run_report(request, report):
working = True working = True
while working: while working:
periods.append((year, month)) temp = (year, month)
month += 1 month += 1
if month > 12: if month > 12:
year += 1 year += 1
month = 1 month = 1
if month > last_month and year >= last_year: if month > last_month and year >= last_year:
working = False working = False
periods.append((temp, (year, month)))
for (low_bound, upper_bound) in periods:
low_sqlmonth = '%s-%02i-01' % (low_bound[0], low_bound[1])
for (year, month) in periods: upper_sqlmonth = '%s-%02i-01' % (upper_bound[0], upper_bound[1])
sqlmonth = '%s-%s' % (year, months[month-1]) desc = '%s %s' % (months[low_bound[1]-1], low_bound[0])
desc = '%s %s' % (months[month-1], year) month_sql.append("""
month_sql.append("COUNT(CASE to_char(t.created, 'YYYY-Mon') WHEN '%s' THEN t.id END) AS \"%s\"" % (sqlmonth, desc)) COUNT(
CASE 1 = 1
WHEN (date(t.created) >= date('%s')
AND date(t.created) < date('%s')) THEN t.id END) AS "%s"
""" % (low_sqlmonth, upper_sqlmonth, desc))
month_columns.append(desc) month_columns.append(desc)
month_sql = ", ".join(month_sql) month_sql = ", ".join(month_sql)
queue_base_sql = """ queue_base_sql = """