Merge pull request #1451 from dbcli/RW/grant-query-offer-database-completion

Let `GRANT ... ON` forms offer schema names as completions

Author: rolandwalker

changelog.md

@@ -16,6 +16,7 @@ Bug Fixes
 * Respect `--logfile` when using `--execute` or standard input at the shell CLI.
 * Gracefully catch Paramiko parsing errors on `--list-ssh-config`.
 * Downgrade to Paramiko 3.5.1 to avoid crashing on DSA SSH keys.
+* Offer schema name completions in `GRANT ... ON` forms.
 
 
 1.44.2 (2026/01/13)

mycli/packages/completion_engine.py

@@ -338,8 +338,9 @@ def suggest_based_on_last_token(
 
             # The lists of 'aliases' could be empty if we're trying to complete
             # a GRANT query. eg: GRANT SELECT, INSERT ON <tab>
-            # In that case we just suggest all tables.
+            # In that case we just suggest all schemata and all tables.
             if not aliases:
+                suggest.append({"type": "database"})
                 suggest.append({"type": "table", "schema": parent})
             return suggest
 

test/test_smart_completion_public_schema_only.py

@@ -456,6 +456,19 @@ def test_un_escaped_table_names(completer, complete_event):
     )
 
 
+# todo: the fixtures are insufficient; the database name should also appear in the result
+def test_grant_on_suggets_tables_and_schemata(completer, complete_event):
+    text = "GRANT ALL ON "
+    position = len(text)
+    result = list(completer.get_completions(Document(text=text, cursor_position=position), complete_event))
+    assert result == [
+        Completion(text='users', start_position=0),
+        Completion(text='orders', start_position=0),
+        Completion(text='`select`', start_position=0),
+        Completion(text='`réveillé`', start_position=0),
+    ]
+
+
 def dummy_list_path(dir_name):
     dirs = {
         "/": [