Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
a5844662
Commit
a5844662
authored
Oct 22, 2014
by
Matt Drayer
Committed by
Jonathan Piacenti
Aug 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mattdrayer/api-time-series-fix: Use backticks instead of quotes
parent
43493ddf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
lms/djangoapps/api_manager/utils.py
+3
-2
No files found.
lms/djangoapps/api_manager/utils.py
View file @
a5844662
...
...
@@ -152,7 +152,7 @@ def get_time_series_data(queryset, start, end, interval='days', date_field='crea
_
,
end
=
get_interval_bounds
(
end
,
interval
.
rstrip
(
's'
))
if
date_field_model
:
date_field
=
'
"{}"."{}"
'
.
format
(
date_field_model
.
_meta
.
db_table
,
date_field
)
date_field
=
'
`{}`.`{}`
'
.
format
(
date_field_model
.
_meta
.
db_table
,
date_field
)
sql
=
{
'mysql'
:
{
...
...
@@ -169,7 +169,7 @@ def get_time_series_data(queryset, start, end, interval='days', date_field='crea
}
}
interval_sql
=
sql
[
engine
][
interval
]
where_clause
=
'{} BETWEEN "{}"
and
"{}"'
.
format
(
date_field
,
start
,
end
)
where_clause
=
'{} BETWEEN "{}"
AND
"{}"'
.
format
(
date_field
,
start
,
end
)
aggregate_data
=
queryset
.
extra
(
select
=
{
'd'
:
interval_sql
},
where
=
[
where_clause
])
.
order_by
()
.
values
(
'd'
)
.
\
annotate
(
agg
=
aggregate
)
...
...
@@ -182,4 +182,5 @@ def get_time_series_data(queryset, start, end, interval='days', date_field='crea
value
=
data
.
get
(
dt_key
,
0
)
series
.
append
((
dt_key
,
value
,))
dt_key
+=
relativedelta
(
**
{
interval
:
1
})
return
series
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment