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

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
More tests.
  • Loading branch information
@felixxm
felixxm committed Jan 24, 2024
commit e181dcbbdcbf2c410a8d13453c7e227a73e8cd3a
61 changes: 54 additions & 7 deletions Lib/test/test_sqlite3/test_dump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,73 @@ def test_table_dump(self):

def test_table_dump_filter(self):
all_table_sqls = [
"""CREATE TABLE "test_table_1" ("id_2" INTEGER);""",
"""INSERT INTO "test_table_1" VALUES(1);""",
"""INSERT INTO "test_table_1" VALUES(2);""",
"""CREATE TABLE "some_table_2" ("id_1" INTEGER);""",
"""INSERT INTO "some_table_2" VALUES(3);""",
"""INSERT INTO "some_table_2" VALUES(4);""",
"""CREATE TABLE "test_table_1" ("id_2" INTEGER);""",
"""INSERT INTO "test_table_1" VALUES(1);""",
"""INSERT INTO "test_table_1" VALUES(2);""",
]
all_views_sqls = [
"""CREATE VIEW view_1 AS SELECT * FROM some_table_2""",
"""CREATE VIEW view_2 AS SELECT * FROM test_table_1""",
"""CREATE VIEW "view_1" AS SELECT * FROM "some_table_2";""",
"""CREATE VIEW "view_2" AS SELECT * FROM "test_table_1";""",
]
# Create database structure.
for sql in [*all_table_sqls, *all_views_sqls]:
self.cu.execute(sql)
# %_table_% matches all tables.
dump_sqls = list(self.cx.iterdump(filter="%_table_%"))
self.assertEqual(dump_sqls, all_table_sqls)
self.assertEqual(
dump_sqls,
["BEGIN TRANSACTION;", *all_table_sqls, "COMMIT;"],
)
# view_% matches all views.
dump_sqls = list(self.cx.iterdump(filter="view_%"))
self.assertEqual(dump_sqls, all_views_sqls)
self.assertEqual(
dump_sqls,
["BEGIN TRANSACTION;", *all_views_sqls, "COMMIT;"],
)
# %_1 matches tables and views with the _1 suffix.
dump_sqls = list(self.cx.iterdump(filter="%_1"))
self.assertEqual(
dump_sqls,
[
"BEGIN TRANSACTION;",
"""CREATE TABLE "test_table_1" ("id_2" INTEGER);""",
"""INSERT INTO "test_table_1" VALUES(1);""",
"""INSERT INTO "test_table_1" VALUES(2);""",
"""CREATE VIEW "view_1" AS SELECT * FROM "some_table_2";""",
"COMMIT;"
],
)
# some_% matches some_table_2.
dump_sqls = list(self.cx.iterdump(filter="some_%"))
self.assertEqual(
dump_sqls,
[
"BEGIN TRANSACTION;",
"""CREATE TABLE "some_table_2" ("id_1" INTEGER);""",
"""INSERT INTO "some_table_2" VALUES(3);""",
"""INSERT INTO "some_table_2" VALUES(4);""",
"COMMIT;"
],
)
# Only single object.
dump_sqls = list(self.cx.iterdump(filter="view_2"))
self.assertEqual(
dump_sqls,
[
"BEGIN TRANSACTION;",
"""CREATE VIEW "view_2" AS SELECT * FROM "test_table_1";""",
"COMMIT;"
],
)
# % matches all objects.
dump_sqls = list(self.cx.iterdump(filter="%"))
self.assertEqual(
dump_sqls,
["BEGIN TRANSACTION;", *all_table_sqls, *all_views_sqls, "COMMIT;"],
)

def test_dump_autoincrement(self):
expected = [
Expand Down