Skip to content

gh-91602: Add iterdump() support for filtering database objects. #114501

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

Merged
erlend-aasland merged 14 commits into from
Feb 6, 2024
Merged

gh-91602: Add iterdump() support for filtering database objects. #114501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bfad36a
gh-91602: Add iterdump() support for filtering database objects.
felixxm Jan 22, 2024
c414251
Run regen-all.
felixxm Jan 24, 2024
b1ae087
Fixed PyObject_Vectorcall() call and SQL placeholder.
felixxm Jan 24, 2024
e181dcb
More tests.
felixxm Jan 24, 2024
048a6a2
Added error handling for Py_*.
felixxm Jan 24, 2024
f09fa46
Corrected error handling.
felixxm Jan 24, 2024
f3bab47
Added docs and release notes.
felixxm Jan 24, 2024
321b3e0
Used Py_BuildValue().
felixxm Jan 25, 2024
8cf51d4
`goto` no longer needed.
felixxm Jan 25, 2024
d993e11
Used PyVectorcall_NARGS().
felixxm Jan 25, 2024
4de91be
Arguments offset.
felixxm Jan 25, 2024
2036d0a
Merge branch 'main' into issue-91602
felixxm Jan 26, 2024
e314153
Corrected docs.
felixxm Jan 26, 2024
3c451df
Pull in main and regen clinic
erlend-aasland Feb 6, 2024
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
Prev Previous commit
Next Next commit
Fixed PyObject_Vectorcall() call and SQL placeholder.
  • Loading branch information
@felixxm
felixxm committed Jan 24, 2024
commit b1ae087a0b757556279c554f5140542700ce38b6
4 changes: 2 additions & 2 deletions Lib/sqlite3/dump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def _iterdump(connection, *, filter=None):

if filter:
# Return database objects which match the filter pattern.
filter_name_clause = 'AND "name" LIKE %s'
filter_name_clause = 'AND "name" LIKE ?'
params = [filter]
else:
filter_name_clause = ""
Expand Down Expand Up @@ -97,7 +97,7 @@ def _iterdump(connection, *, filter=None):
"type" IN ('index', 'trigger', 'view')
{filter_name_clause}
"""
schema_res = cu.execute(q)
schema_res = cu.execute(q, params)
for name, type, sql in schema_res.fetchall():
yield('{0};'.format(sql))

Expand Down
6 changes: 4 additions & 2 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,8 +2003,10 @@ pysqlite_connection_iterdump_impl(pysqlite_Connection *self,
}
return NULL;
}
PyObject *args[1] = {(PyObject *)self};
PyObject *retval = PyObject_Vectorcall(iterdump, args, 1, filter);
PyObject *args[2] = {(PyObject *)self, filter};
PyObject *kwnames = PyTuple_New(1);
PyTuple_SET_ITEM(kwnames, 0, PyUnicode_FromString("filter"));
PyObject *retval = PyObject_Vectorcall(iterdump, args, 1, kwnames);
Comment thread
felixxm marked this conversation as resolved.
Outdated
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
Py_DECREF(iterdump);
return retval;
}
Expand Down