Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion packages/django-google-spanner/django_spanner/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,10 @@ def add_index(self, model, index):
def quote_value(self, value):
# A more complete implementation isn't currently required.
if isinstance(value, str):
return "'%s'" % value.replace("'", "''")
# GoogleSQL string literals use backslash escaping; '' quote
# doubling is not recognized, so escape the backslash first and
# then the quote (matching the db_default/generated inlining above).
return "'%s'" % value.replace("\\", "\\\\").replace("'", "\\'")

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.

medium

In GoogleSQL, single-quoted string literals cannot contain literal newlines (\n) or carriage returns (\r). If a string containing these characters is passed to quote_value, it will result in a syntax error in Spanner. To prevent this, we should also escape newlines and carriage returns.

Suggested change
return "'%s'" % value.replace("\\", "\\\\").replace("'", "\\'")
return "'%s'" % value.replace("\\", "\\\\").replace("'", "\\'").replace("\n", "\\n").replace("\r", "\\r")

if isinstance(value, bool):
return "TRUE" if value else "FALSE"
return str(value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ def test_quote_value(self):
schema_editor = DatabaseSchemaEditor(self.connection)
self.assertEqual(schema_editor.quote_value(value=1.1), "1.1")

def test_quote_value_escapes_string(self):
"""
String literals must be backslash-escaped for GoogleSQL. A quote or
backslash in the value must not be able to terminate the literal.
"""
schema_editor = DatabaseSchemaEditor(self.connection)
self.assertEqual(schema_editor.quote_value(value="o'brien"), "'o\\'brien'")
self.assertEqual(schema_editor.quote_value(value="a\\b"), "'a\\\\b'")
self.assertEqual(
schema_editor.quote_value(value="\\'; DROP TABLE t; --"),
"'\\\\\\'; DROP TABLE t; --'",
)

def test_skip_default(self):
"""
Tries skipping default as Cloud spanner doesn't support it.
Expand Down
Loading