Skip to content

Commit 779af60

Browse files
committed
refactor select() method
1 parent d8e88b5 commit 779af60

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

simple_query_builder/querybuilder.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,18 +256,14 @@ def select(self, table: Union[str, dict], fields: Union[str, list, dict] = '*'):
256256

257257
self.reset()
258258

259-
if isinstance(fields, dict) or isinstance(fields, list):
259+
if isinstance(fields, dict) or isinstance(fields, list) or isinstance(fields, str):
260260
self._sql = f"SELECT {self._prepare_aliases(fields)}"
261-
elif isinstance(fields, str):
262-
self._sql = f"SELECT {fields}"
263261
else:
264262
self.set_error(f"Incorrect type of fields in {inspect.stack()[0][3]} method. Fields must be String, List or Dictionary")
265263
return self
266264

267-
if isinstance(table, dict):
265+
if isinstance(table, dict) or isinstance(table, str):
268266
self._sql += f" FROM {self._prepare_aliases(table)}"
269-
elif isinstance(table, str):
270-
self._sql += f" FROM `{table}`"
271267
else:
272268
self.set_error(f"Incorrect type of table in {inspect.stack()[0][3]} method. Table must be String or Dictionary")
273269
return self

0 commit comments

Comments
 (0)