Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions djongo/sql2mongo/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def _get_cursor(self):
cur = self.db[self.left_table].aggregate(pipeline, allowDiskUse=True)
logger.debug(f'Aggregation query: {pipeline}')
else:
query = self.where.to_mongo() if self.where else {}
query = self.where.to_mongo().get("filter", {}) if self.where else {}
selected_columns = self.selected_columns.to_mongo().get("projection", None) if self.selected_columns else None
projection = {i: 1 for i in selected_columns} if selected_columns else None

Expand Down Expand Up @@ -360,19 +360,20 @@ def _columns(self, statement: SQLStatement):
tok = statement.next()
self._cols = [token.column for token in SQLToken.tokens2sql(tok[1], self)]

def _fill_values(self, statement: SQLStatement):
def _fill_values(self, statement):
for tok in statement:
if isinstance(tok, Parenthesis):
placeholder = SQLToken.token2sql(tok, self)
values = []
for index in placeholder:
if isinstance(index, int):
values.append(self.params[index])
else:
values.append(index)
values = [self.params[i] if isinstance(i, int) else i for i in placeholder]
self._values.append(values)
elif not tok.match(tokens.Keyword, 'VALUES'):
raise SQLDecodeError

elif tok.value.upper().startswith("VALUES"):
matches = re.findall(r"%\((\d+)\)s", tok.value)
values = [self.params[int(i)] for i in matches]
self._values.append(values)

else:
raise SQLDecodeError(f"Unexpected token in _fill_values: {tok}")

def execute(self):
docs = []
Expand Down