Skip to content

Fix AttributeError when executing empty or comment-only scripts #1303

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
veeceey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix AttributeError when executing empty or comment-only scripts #1303

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
5 changes: 4 additions & 1 deletion asyncpg/protocol/protocol.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,10 @@ cdef class BaseProtocol(CoreProtocol):
waiter.set_result(self.result)

cdef _on_result__simple_query(self, object waiter):
waiter.set_result(self.result_status_msg.decode(self.encoding))
if self.result_status_msg is not None:
waiter.set_result(self.result_status_msg.decode(self.encoding))
else:
waiter.set_result(None)

cdef _on_result__copy_out(self, object waiter):
cdef bint copy_done = self.state == PROTOCOL_COPY_OUT_DONE
Expand Down
13 changes: 13 additions & 0 deletions tests/test_execute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@ async def test_execute_script_check_transactionality(self):
SELECT * FROM mytab
''')

async def test_execute_empty_script(self):
# Test executing a script with only comments (issue #1259)
result = await self.con.execute('-- hello')
self.assertIsNone(result)

# Test executing a script with only whitespace
result = await self.con.execute(' ')
self.assertIsNone(result)

# Test executing an empty script
result = await self.con.execute('')
self.assertIsNone(result)

async def test_execute_exceptions_1(self):
with self.assertRaisesRegex(asyncpg.PostgresError,
'relation "__dne__" does not exist'):
Expand Down