github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 13:41:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix args in the correct order for datatables queries

Browse source 
Fixes #813
This commit is contained in:
JonnyWong16 2016-08-26 18:14:26 -07:00
parent b55a563fce
commit 5b4a22276d
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plexpy/datatables.py
View file

@ -65,23 +65,20 @@ class DataTables(object):
extracted_columns['column_named'], extracted_columns['column_named'],
parameters['columns']) parameters['columns'])
args = cw_args + w_args
# Build union parameters # Build union parameters
if table_name_union: if table_name_union:
extracted_columns_union = self.extract_columns(columns=columns_union) extracted_columns_union = self.extract_columns(columns=columns_union)
group_u = self.build_grouping(group_by_union) group_u = self.build_grouping(group_by_union)
c_where_u, cwu_args = self.build_custom_where(custom_where_union) c_where_u, cwu_args = self.build_custom_where(custom_where_union)
args += cwu_args
union = 'UNION SELECT %s FROM %s %s %s' % (extracted_columns_union['column_string'], union = 'UNION SELECT %s FROM %s %s %s' % (extracted_columns_union['column_string'],
table_name_union, table_name_union,
c_where_u, c_where_u,
group_u) group_u)
else: else:
union = '' union = ''
cwu_args = []
args = cw_args + cwu_args + w_args
# Build the query # Build the query
query = 'SELECT * FROM (SELECT %s FROM %s %s %s %s %s) %s %s' \ query = 'SELECT * FROM (SELECT %s FROM %s %s %s %s %s) %s %s' \