Skip to content

Commit 7f1cdee

Browse files
committed
add _prepare_fieldlist() method
1 parent d46ad63 commit 7f1cdee

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

simple_query_builder/querybuilder.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def _prepare_aliases(self, items: Union[str, list, dict], as_list: bool = False)
217217
self.set_error(f"Incorrect type of items in {inspect.stack()[0][3]} method")
218218
return ''
219219

220-
return ', '.join(sql) if not as_list else sql
220+
return self._prepare_fieldlist(sql) if not as_list else sql
221221

222222
def _prepare_conditions(self, where: Union[str, list]) -> dict:
223223
result = {'sql': '', 'values': []}
@@ -351,6 +351,12 @@ def _prepare_sorting(self, field: str = '', sort: str = '') -> tuple:
351351

352352
return f"`{field}`", sort
353353

354+
def _prepare_fieldlist(self, fields: Union[tuple, list] = ()) -> str:
355+
if fields == () or fields == []:
356+
self.set_error(f"Empty fieldlist in {inspect.stack()[0][3]} method")
357+
return ''
358+
return ', '.join(fields)
359+
354360
def order_by(self, field: Union[str, tuple, list] = (), sort: str = ''):
355361
if field == '' or field == () or field == []:
356362
self.set_error(f"Empty field in {inspect.stack()[0][3]} method")
@@ -365,7 +371,7 @@ def order_by(self, field: Union[str, tuple, list] = (), sort: str = ''):
365371
self._sql += f" ORDER BY {field}"
366372
elif isinstance(field, tuple) or isinstance(field, list):
367373
new_list = [f"{self._prepare_sorting(item)[0]} {self._prepare_sorting(item)[1]}" for item in field]
368-
self._sql += ' ORDER BY ' + ', '.join(new_list)
374+
self._sql += ' ORDER BY ' + self._prepare_fieldlist(new_list)
369375

370376
return self
371377

0 commit comments

Comments
 (0)