Merge pull request #219 from dbcli/krace/issue-149-add-index-command-to-schema

Return indexes when .schema is run

Author: amjith

CHANGELOG.md

@@ -11,6 +11,7 @@
 
 * Fix a bug where the `\llm` command on alternate invocations weren't detected correctly. (#211)
 * Do not escape upper table or column name. [(#185)](https://github.com/dbcli/litecli/issues/185)
+* Return indices when `.schema` command is run. Also update the output to contain the `sql` for the `indexes` command. [(#149)](https://github.com/dbcli/litecli/issues/149)
 
 ### Internal
 

litecli/packages/special/dbcommands.py

@@ -102,7 +102,7 @@ def show_schema(cur, arg=None, **_):
         args = (arg,)
         query = """
             SELECT sql FROM sqlite_master
-            WHERE name==? AND sql IS NOT NULL
+            WHERE tbl_name==? AND sql IS NOT NULL
             ORDER BY tbl_name, type DESC, name
         """
     else:
@@ -124,7 +124,6 @@ def show_schema(cur, arg=None, **_):
 
     return [(None, tables, headers, status)]
 
-
 @special_command(
     ".databases",
     ".databases",
@@ -143,7 +142,6 @@ def list_databases(cur, **_):
     else:
         return [(None, None, None, "")]
 
-
 @special_command(
     ".indexes",
     ".indexes [tablename]",
@@ -156,14 +154,14 @@ def list_indexes(cur, arg=None, arg_type=PARSED_QUERY, verbose=False):
     if arg:
         args = ("{0}%".format(arg),)
         query = """
-            SELECT name FROM sqlite_master
+            SELECT name, sql FROM sqlite_master
             WHERE type = 'index' AND tbl_name LIKE ? AND name NOT LIKE 'sqlite_%'
             ORDER BY 1
         """
     else:
         args = tuple()
         query = """
-            SELECT name FROM sqlite_master
+            SELECT name, sql FROM sqlite_master
             WHERE type = 'index' AND name NOT LIKE 'sqlite_%'
             ORDER BY 1
         """

litecli/packages/special/llm.py

@@ -20,6 +20,8 @@
 except ImportError:
     llm = None
     cli = None
+    LLM_CLI_COMMANDS = []
+    MODELS = {}
 
 from . import export
 from .main import parse_special_command

litecli/sqlexecute.py

@@ -38,7 +38,7 @@ class SQLExecute(object):
     """
 
     indexes_query = """
-        SELECT name
+        SELECT name, sql
         FROM sqlite_master
         WHERE type = 'index' AND name NOT LIKE 'sqlite_%'
         ORDER BY 1