gh-135883: Fix sqlite3 CLI keeps part of previous commands when scrolling history

Lib/sqlite3/__main__.py

@@ -133,8 +133,12 @@ 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.
+    # See https://stackoverflow.com/a/9468954 for more details.
+    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:

Lib/test/test_sqlite3/test_cli.py

@@ -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 (
@@ -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("\001\x1b[1;35m\002sqlite> \001\x1b[0m\002", out)
+            self.assertIn("\001\x1b[1;35m\002    ... \001\x1b[0m\002\001\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)
@@ -212,7 +212,7 @@ def test_color(self):
 @requires_subprocess()
 @force_not_colorized_test_class
 class Completion(unittest.TestCase):
-    PS1 = "sqlite> "
+    PS1_NO_COLOR = "sqlite> "
 
     @classmethod
     def setUpClass(cls):
@@ -288,7 +288,7 @@ def test_complete_table_indexes_triggers_views(self):
         output = self.write_input(input_)
         lines = output.decode().splitlines()
         indices = [i for i, line in enumerate(lines)
-                  if line.startswith(self.PS1)]
+                  if line.startswith(self.PS1_NO_COLOR)]
         start, end = indices[-3], indices[-2]
         candidates = [l.strip() for l in lines[start+1:end]]
         self.assertEqual(candidates,
@@ -327,7 +327,7 @@ def test_complete_columns(self):
         output = self.write_input(input_)
         lines = output.decode().splitlines()
         indices = [
-            i for i, line in enumerate(lines) if line.startswith(self.PS1)
+            i for i, line in enumerate(lines) if line.startswith(self.PS1_NO_COLOR)
         ]
         start, end = indices[-3], indices[-2]
         candidates = [l.strip() for l in lines[start+1:end]]
@@ -365,7 +365,7 @@ def test_complete_schemata(self):
         output = self.write_input(input_)
         lines = output.decode().splitlines()
         indices = [
-            i for i, line in enumerate(lines) if line.startswith(self.PS1)
+            i for i, line in enumerate(lines) if line.startswith(self.PS1_NO_COLOR)
         ]
         start, end = indices[-4], indices[-3]
         candidates = [l.strip() for l in lines[start+1:end]]
@@ -385,7 +385,7 @@ def test_complete_no_match(self):
         lines = output.decode().splitlines()
         indices = (
             i for i, line in enumerate(lines, 1)
-            if line.startswith(f"{self.PS1}xyzzy")
+            if line.startswith(f"{self.PS1_NO_COLOR}xyzzy")
         )
         line_num = next(indices, -1)
         self.assertNotEqual(line_num, -1)
@@ -419,7 +419,7 @@ def test_complete_no_input(self):
             lines = output.decode().splitlines()
             indices = [
                 i for i, line in enumerate(lines)
-                if line.startswith(self.PS1)
+                if line.startswith(self.PS1_NO_COLOR)
             ]
             self.assertEqual(len(indices), 2)
             start, end = indices

Misc/NEWS.d/next/Library/2025-06-24-19-07-18.gh-issue-135883.38cePA.rst

@@ -0,0 +1,2 @@
+Fix :mod:`sqlite3`'s :ref:`interactive shell <sqlite3-cli>` keeping part of
+previous commands when scrolling history.