Skip to content

Fix raw_values mutation that broke repeated raw= searches #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roed-math wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix raw_values mutation that broke repeated raw= searches #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions psycodict/searchtable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,13 +489,26 @@ def _build_query(self, query, limit=None, offset=0, sort=None, raw=None, one_per
sage: statement, vals = db.nf_fields._build_query({"class_number":1}, 20)
sage: statement.as_string(db.conn), vals
(' WHERE "class_number" = %s ORDER BY "id" LIMIT %s', [1, 20])

A ``raw_values`` list passed in by the caller is not mutated, even
though the limit and offset are appended to the returned values::

sage: raw_values = []
sage: statement, vals = db.nf_fields._build_query({}, 20, raw="degree = 2", raw_values=raw_values)
sage: statement.as_string(db.conn), vals
(' WHERE degree = 2 ORDER BY "degree", "disc_abs", "disc_sign", "iso_number" LIMIT %s', [20])
sage: raw_values
[]
"""
if raw_values is None:
raw_values = []
if raw is None:
qstr, values = self._parse_dict(query)
else:
qstr, values = SQL(raw), raw_values
# Copy raw_values: we append limit/offset to ``values`` below, and
# must not mutate the list passed in by the caller (in particular
# the shared default of search()/lucky()).
qstr, values = SQL(raw), list(raw_values)
if qstr is None:
where = SQL("")
values = []
Expand Down Expand Up @@ -630,7 +643,7 @@ def _get_table_clause(self, extra_cols):
else:
return Identifier(self.search_table)

def lucky(self, query={}, projection=2, offset=0, sort=[], raw=None, raw_values=[]):
def lucky(self, query={}, projection=2, offset=0, sort=[], raw=None, raw_values=None):
# FIXME Nulls aka Nones are being erased, we should perhaps just leave them there
"""
One of the two main public interfaces for performing SELECT queries,
Expand Down Expand Up @@ -721,7 +734,7 @@ def search(
one_per=None,
silent=False,
raw=None,
raw_values=[],
raw_values=None,
):
"""
One of the two main public interfaces for performing SELECT queries,
Expand Down