Skip to content

Escape bytes parameters as strings, not as ARRAY of ints #959

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

Open
Shubham-Padkonde wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Escape bytes parameters as strings, not as ARRAY of ints #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/databricks/sql/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,8 @@ def escape_item(self, item):
return "NULL"
elif isinstance(item, (int, float)):
return self.escape_number(item)
elif isinstance(item, str):
elif isinstance(item, (str, bytes)):
# bytes are a Sequence too, but escape_string decodes them as a string
return self.escape_string(item)
elif isinstance(item, datetime.datetime):
return self.escape_datetime(item, self._DATETIME_FORMAT)
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/test_param_escaper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ def test_escape_date(self):
OUTPUT = "'1991-08-03'"
assert pe.escape_datetime(INPUT, FORMAT) == OUTPUT

def test_escape_item_bytes_as_string(self):
"""bytes are escaped like the equivalent str, not as an ARRAY of ints"""
assert pe.escape_item(b"golly bob howdy") == "'golly bob howdy'"
assert pe.escape_item("golly bob howdy".encode("utf-8")) == pe.escape_item(
"golly bob howdy"
)
assert pe.escape_item([b"his", b"name"]) == "ARRAY('his','name')"

def test_escape_sequence_integer(self):
assert pe.escape_sequence([1, 2, 3, 4]) == "ARRAY(1,2,3,4)"

Expand Down