Merge pull request #200 from dbcli/fix-completion-error

Fix completion error

Author: amjith

CHANGELOG.md

@@ -8,7 +8,8 @@
 
 ### Bug Fixes
 
-* Fix the windows path shown in prompt to remove escaping.
+* Fix the [windows path](https://github.com/dbcli/litecli/issues/187) shown in prompt to remove escaping.
+* Fix a bug where if column name was same as table name it was [crashing](https://github.com/dbcli/litecli/issues/155) the autocompletion.
 
 ### Internal
 

litecli/sqlexecute.py

@@ -32,7 +32,7 @@ class SQLExecute(object):
     table_columns_query = """
         SELECT m.name as tableName, p.name as columnName
         FROM sqlite_master m
-        LEFT OUTER JOIN pragma_table_info((m.name)) p ON m.name <> p.name
+        JOIN pragma_table_info((m.name)) p
         WHERE m.type IN ('table','view') AND m.name NOT LIKE 'sqlite_%'
         ORDER BY tableName, columnName
     """

tests/test_sqlexecute.py

@@ -38,13 +38,15 @@ def test_binary(executor):
 
 
 ## Failing in Travis for some unknown reason.
-# @dbtest
-# def test_table_and_columns_query(executor):
-#     run(executor, "create table a(x text, y text)")
-#     run(executor, "create table b(z text)")
-
-#     assert set(executor.tables()) == set([("a",), ("b",)])
-#     assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z")])
+@dbtest
+def test_table_and_columns_query(executor):
+    run(executor, "create table a(x text, y text)")
+    run(executor, "create table b(z text)")
+    run(executor, "create table t(t text)")
+
+    assert set(executor.tables()) == set([("a",), ("b",), ("t",)])
+    assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")])
+    assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")])
 
 
 @dbtest