gh-153658: Fix sqlite3 iterdump() for table names containing a single quote#153659
Open
tonghuaroot wants to merge 1 commit into
Open
gh-153658: Fix sqlite3 iterdump() for table names containing a single quote#153659tonghuaroot wants to merge 1 commit into
tonghuaroot wants to merge 1 commit into
Conversation
…single quote Patch by tonghuaroot.
erlend-aasland
left a comment
Contributor
There was a problem hiding this comment.
Thanks for the report and the PR! Mostly looks good, but I have a nitpick regarding the inlined escaping.
| table_name_ident, | ||
| # In the string-literal copy any single quote must be doubled; | ||
| # the FROM clause below uses the identifier form as-is. | ||
| table_name_literal = table_name_ident.replace("'", "''") |
Contributor
There was a problem hiding this comment.
To prevent scattering .replace around in dump.py, consider something like this:
diff --git a/Lib/sqlite3/dump.py b/Lib/sqlite3/dump.py
index d39cebb3e25..b33278567ce 100644
--- a/Lib/sqlite3/dump.py
+++ b/Lib/sqlite3/dump.py
@@ -11,8 +11,12 @@ def _quote_name(name):
return '"{0}"'.format(name.replace('"', '""'))
+def _escape_single_quotes(value):
+ return value.replace("'", "''")
+
+
def _quote_value(value):
- return "'{0}'".format(value.replace("'", "''"))
+ return "'{0}'".format(_escape_single_quotes)
def _iterdump(connection, *, filter=None):
@@ -80,11 +84,8 @@ def _iterdump(connection, *, filter=None):
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()]
- # In the string-literal copy any single quote must be doubled;
- # the FROM clause below uses the identifier form as-is.
- table_name_literal = table_name_ident.replace("'", "''")
q = "SELECT 'INSERT INTO {0} VALUES('{1}')' FROM {2};".format(
- table_name_literal,
+ _escape_single_quotes(table_name_ident),
"','".join(
"||quote({0})||".format(_quote_name(col)) for col in column_names
),
IMO, that would also make the comment redundant.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
sqlite3.Connection.iterdump()raisedsqlite3.OperationalErrorfor a tableor column name containing a single quote, because the generated INSERT
statement embeds the quoted identifier inside a single-quoted SQL string
literal without doubling the single quotes. The
FROMclause uses theidentifier form as-is; only the string-literal copy needs escaping.
Doubling the single quotes in the string-literal copy makes the dump of a
table whose name contains
'well-formed again, and it round-trips throughexecutescript(). Names containing a double quote or a newline were alreadyhandled and are unaffected.