8000 gh-108364: Simplify quoting values and identifiers in sqlite3's iterdump() by felixxm · Pull Request #108472 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-108364: Simplify quoting values and identifiers in sqlite3's iterdump() #108472

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
merged 3 commits into from
Aug 25, 2023
Merged

gh-108364: Simplify quoting values and identifiers in sqlite3's iterdump() #108472

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2423154
gh-108364: Simplify quoting values/identifiers in sqlite3.dump._iter …
felixxm Aug 25, 2023
cb1316a
Merge branch 'main' into sqlite-dump-readable
erlend-aasland Aug 25, 2023
44ad918
Merge branch 'main' into sqlite-dump-readable
erlend-aasland Aug 25, 2023
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
25 changes: 18 additions & 7 deletions Lib/sqlite3/dump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
# future enhancements, you should normally quote any identifier that
# is an English language word, even if you do not have to."

def _quote_name(name):
return '"{0}"'.format(name.replace('"', '""'))


def _quote_value(value):
return "'{0}'".format(value.replace("'", "''"))


def _iterdump(connection):
"""
Returns an iterator to the dump of the database in an SQL text format.
Expand All @@ -31,11 +39,11 @@ def _iterdump(connection):
sqlite_sequence = []
for table_name, type, sql in schema_res.fetchall():
if table_name == 'sqlite_sequence':
rows = cu.execute('SELECT * FROM "sqlite_sequence";').fetchall()
rows = cu.execute('SELECT * FROM "sqlite_sequence";')
sqlite_sequence = ['DELETE FROM "sqlite_sequence"']
sqlite_sequence += [
f'INSERT INTO "sqlite_sequence" VALUES(\'{row[0]}\',{row[1]})'
for row in rows
f'INSERT INTO "sqlite_sequence" VALUES({_quote_value(table_name)},{seq_value})'
for table_name, seq_value in rows.fetchall()
]
continue
elif table_name == 'sqlite_stat1':
Expand All @@ -53,12 +61,15 @@ def _iterdump(connection):
yield('{0};'.format(sql))

# Build the insert statement for each row of the current table
table_name_ident = table_name.replace('"', '""')
res = cu.execute('PRAGMA table_info("{0}")'.format(table_name_ident))
table_name_ident = _quote_name(table_name)
res = cu.execute(f'PRAGMA table_info({table_name_ident})')
column_names = [str(table_info[1]) for table_info in res.fetchall()]
q = """SELECT 'INSERT INTO "{0}" VALUES({1})' FROM "{0}";""".format(
q = "SELECT 'INSERT INTO {0} VALUES('{1}')' FROM {0};".format(
table_name_ident,
",".join("""'||quote("{0}")||'""".format(col.replace('"', '""')) for col in column_names))
"','".join(
"||quote({0})||".format(_quote_name(col)) for col in column_names
)
)
query_res = cu.execute(q)
for row in query_res:
yield("{0};".format(row[0]))
Expand Down
0