Skip to content
Merged
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
7 changes: 5 additions & 2 deletions Lib/sqlite3/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,11 @@ def main(*args):
theme = get_theme()
s = theme.syntax

sys.ps1 = f"{s.prompt}sqlite> {s.reset}"
sys.ps2 = f"{s.prompt} ... {s.reset}"
# Use RL_PROMPT_START_IGNORE (\001) and RL_PROMPT_END_IGNORE (\002) to
# bracket non-printing characters. This tells readline to ignore them
# when calculating screen space for redisplay during history scrolling.
sys.ps1 = f"\001{s.prompt}\002sqlite> \001{s.reset}\002"
sys.ps2 = f"\001{s.prompt}\002 ... \001{s.reset}\002"

con = sqlite3.connect(args.filename, isolation_level=None)
try:
Expand Down
12 changes: 8 additions & 4 deletions Lib/test/test_sqlite3/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ def test_cli_on_disk_db(self):
@force_not_colorized_test_class
class InteractiveSession(unittest.TestCase):
MEMORY_DB_MSG = "Connected to a transient in-memory database"
PS1 = "sqlite> "
PS2 = "... "
PS1 = "\001\002sqlite> \001\002"
PS2 = "\001\002 ... \001\002"

def run_cli(self, *args, commands=()):
with (
Expand Down Expand Up @@ -202,8 +202,8 @@ def test_interact_on_disk_file(self):
def test_color(self):
with unittest.mock.patch("_colorize.can_colorize", return_value=True):
out, err = self.run_cli(commands="TEXT\n")
self.assertIn("\x1b[1;35msqlite> \x1b[0m", out)
self.assertIn("\x1b[1;35m ... \x1b[0m\x1b", out)
self.assertIn("\x01\x1b[1;35m\x02sqlite> \x01\x1b[0m\x02", out)
self.assertIn("\x01\x1b[1;35m\x02 ... \x01\x1b[0m\x02\x01\x1b", out)
out, err = self.run_cli(commands=("sel;",))
self.assertIn('\x1b[1;35mOperationalError (SQLITE_ERROR)\x1b[0m: '
'\x1b[35mnear "sel": syntax error\x1b[0m', err)
Expand All @@ -212,6 +212,10 @@ def test_color(self):
@requires_subprocess()
@force_not_colorized_test_class
class Completion(unittest.TestCase):
# run_pty() creates a real terminal environment, where sqlite3 CLI
# SqliteInteractiveConsole invokes GNU Readline for input. Readline's
# _rl_strip_prompt() strips \001 and \002 from the output, so test
# assertions use the plain prompt.
PS1 = "sqlite> "

@classmethod
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :mod:`sqlite3`'s :ref:`interactive shell <sqlite3-cli>` keeping part of
previous commands when scrolling history.
Loading