Skip to content

gh-100450: Add sqlite.Row.__contains__ method #100457

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

Closed
sobolevn wants to merge 4 commits into from
Closed

gh-100450: Add sqlite.Row.__contains__ method #100457

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62134f7
gh-100450: Add `sqlite.Row.__contains__` method
sobolevn Dec 23, 2022
5b089dd
Remove cast
sobolevn Dec 23, 2022
251d4bf
Address review
sobolevn Dec 23, 2022
5e419b5
Add a unit test
sobolevn Dec 23, 2022
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
4 changes: 4 additions & 0 deletions Doc/library/sqlite3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2392,6 +2392,10 @@ Queries now return :class:`!Row` objects:
'Earth'
>>> row["RADIUS"] # Column names are case-insensitive.
6378
>>> 'name' in row
True
>>> 'missing_field' in row
False

You can create a custom :attr:`~Cursor.row_factory`
that returns each row as a :class:`dict`, with column names mapped to values:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2022-12-23-14-40-16.gh-issue-100450.sevifI.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ``sqlite.Row.__contains__`` method.
20 changes: 20 additions & 0 deletions Modules/_sqlite/row.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,25 @@ PyObject* pysqlite_row_item(pysqlite_Row* self, Py_ssize_t idx)
return Py_XNewRef(item);
}

static int
pysqlite_row_contains(pysqlite_Row* self, PyObject *arg)
{
Py_ssize_t nitems, i;

@erlend-aasland erlend-aasland Dec 23, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use intermingled declarations :)

int cmp = 0;

nitems = PyTuple_Size(self->description);

for (i = 0; cmp == 0 && i < nitems; i++) {
cmp = PyObject_RichCompareBool(
arg,
PyTuple_GET_ITEM(PyTuple_GET_ITEM(self->description, i), 0),

@erlend-aasland erlend-aasland Dec 23, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a lot happening on this line. I'd prefer it if you extracted these items before calling PyObject_RichCompareBool, for improved readability.

Py_EQ
);
}

return cmp;
}

static int
equal_ignore_case(PyObject *left, PyObject *right)
{
Expand Down Expand Up @@ -249,6 +268,7 @@ static PyType_Slot row_slots[] = {
{Py_mp_subscript, pysqlite_row_subscript},
{Py_sq_length, pysqlite_row_length},
{Py_sq_item, pysqlite_row_item},
{Py_sq_contains, pysqlite_row_contains},
{Py_tp_new, pysqlite_row_new},
{Py_tp_traverse, row_traverse},
{Py_tp_clear, row_clear},
Expand Down