Address Bénédikt's review

python · erlend-aasland · Jun 6, 2025 · May 4, 2025 · May 4, 2025 · May 4, 2025
commit 70f46e9781868924d63aadfe9a1dd3fd5815f5ee
@@ -1,7 +1,7 @@
 from contextlib import contextmanager
 
 
-_keywords = ("ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ALWAYS",
+KEYWORDS = ("ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ALWAYS",
             "ANALYZE", "AND", "AS", "ASC", "ATTACH", "AUTOINCREMENT",
             "BEFORE", "BEGIN", "BETWEEN", "BY", "CASCADE", "CASE", "CAST",
             "CHECK", "COLLATE", "COLUMN", "COMMIT", "CONFLICT",
@@ -32,7 +32,7 @@
 def _complete(text, state):
     global _completion_matches
     if state == 0:
-        _completion_matches = [c + " " for c in _keywords if c.startswith(text.upper())]
+        _completion_matches = [c + " " for c in KEYWORDS if c.startswith(text.upper())]
     try:
         return _completion_matches[state]
     except IndexError:

@@ -4,6 +4,7 @@
 import unittest
 
 from sqlite3.__main__ import main as cli
+from sqlite3._completer import KEYWORDS
 from test.support.import_helper import import_module
 from test.support.os_helper import TESTFN, unlink
 from test.support.pty_helper import run_pty
@@ -205,22 +206,18 @@ def test_color(self):
                           '\x1b[35mnear "sel": syntax error\x1b[0m', err)
 
 @requires_subprocess()
-class Completer(unittest.TestCase):
+class CompletionTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        # Ensure that the readline module is loaded
-        # If this fails, the test is skipped because SkipTest will be raised
         readline = import_module("readline")
         if readline.backend == "editline":
             raise unittest.SkipTest("libedit readline is not supported")
 
     def test_keyword_completion(self):
         script = "from sqlite3.__main__ import main; main()"
         # List candidates starting with 'S', there should be multiple matches.
-        # Then add 'EL' and complete 'SEL' to 'SELECT'.  Quit console in the end
-        # to let run_pty() return.
         input = b"S\t\tEL\t 1;\n.quit\n"
-        output = run_pty(script, input)
+        output = run_pty(script, input, env={"NO_COLOR": "1"})
         # Remove control sequences that colorize typed prefix 'S'
         output = re.sub(rb"\x1b\[[0-9;]*[mK]", b"", output)
         self.assertIn(b"SELECT", output)
@@ -235,5 +232,24 @@ def test_keyword_completion(self):
         self.assertIn(b"SELECT", output)
         self.assertIn(b"(1,)", output)
 
+    def test_nothing_to_complete(self):
+        script = "from sqlite3.__main__ import main; main()"
+        input = b"zzzz\t;\n.quit\n"
+        output = run_pty(script, input, env={"NO_COLOR": "1"})
+        output = re.sub(rb"\x1b\[[0-9;]*[mK]", b"", output)
+        for keyword in KEYWORDS:
+            self.assertNotRegex(output, rf"\b{keyword}\b".encode("utf-8"))
+
+    def test_completion_order(self):
+        script = "from sqlite3.__main__ import main; main()"
+        input = b"S\t\n.quit\n"
+        output = run_pty(script, input, env={"NO_COLOR": "1"})
+        output = re.sub(rb"\x1b\[[0-9;]*[mK]", b"", output).strip()
+        savepoint_idx = output.find(b"SAVEPOINT")
+        select_idx = output.find(b"SELECT")
+        set_idx = output.find(b"SET")
+        self.assertTrue(0 <= savepoint_idx < select_idx < set_idx)
+
+
 if __name__ == "__main__":
     unittest.main()