Skip to content

gh-133439: Fix dot commands with trailing spaces are mistaken for multi-line sqlite statements in the sqlite3 command-line interface #133440

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
serhiy-storchaka merged 11 commits into from
May 9, 2025
Merged

gh-133439: Fix dot commands with trailing spaces are mistaken for multi-line sqlite statements in the sqlite3 command-line interface #133440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
080d0c8
gh-133439: fix dot commands with trailing spaces are not recognized i…
tanloong May 5, 2025
cd277f3
Add news entry
tanloong May 5, 2025
e2703b4
Only strip trailing whitespaces
tanloong May 6, 2025
a4498ab
Support spaces after dot
tanloong May 9, 2025
9b3ed39
Handle unknown dot commands
tanloong May 9, 2025
4023fb1
Add tests for unknown dot commands
tanloong May 9, 2025
b473fe9
Handle empty string input; Add test; Improve news entry
tanloong May 9, 2025
bb0c7d9
Use as-patern to capture the unknow command
tanloong May 9, 2025
5ec7198
Ignore empty dot command
tanloong May 9, 2025
caf47bc
Remove "Enter .help" message; Redirect error to stderr
tanloong May 9, 2025
e1ea159
Fix test
tanloong May 9, 2025
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: 3 additions & 2 deletions Lib/sqlite3/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ def runsource(self, source, filename="<input>", symbol="single"):
case "quit":
sys.exit(0)
case _ as unknown:
print("Error: unknown command or invalid arguments: "
f'"{unknown}". Enter ".help" for help')
if unknown:
print("Error: unknown command or invalid arguments:"
f' "{unknown}". Enter ".help" for help')
else:
if not sqlite3.complete_statement(source):
return True
Expand Down
9 changes: 6 additions & 3 deletions Lib/test/test_sqlite3/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,15 @@ def test_interact_empty_source(self):
self.assertEqual(out.count(self.PS2), 0)

def test_interact_dot_commands_unknown(self):
out, err = self.run_cli(commands=(".unknown_command",))
out, err = self.run_cli(commands=(".unknown_command", "."))
self.assertIn(self.MEMORY_DB_MSG, err)
self.assertEndsWith(out, self.PS1)
self.assertEqual(out.count(self.PS1), 2)
self.assertEqual(out.count(self.PS1), 3)
self.assertEqual(out.count(self.PS2), 0)
self.assertIn('Error: unknown command or invalid arguments: "unknown_command"', out)
# test "unknown_command" is pointed out in the error message
self.assertIn("unknown_command", out)
# test ignore empty dot command "." to mimic sqlite3 CLI
self.assertEqual(out.count('Error'), 1)

def test_interact_dot_commands_with_whitespaces(self):
out, err = self.run_cli(commands=(".version ", ". version"))
Expand Down
Loading