diff options
| author | Joakim Koljonen <koljonen@outlook.com> | 2017-08-06 08:59:03 +0200 |
|---|---|---|
| committer | Joakim Koljonen <koljonen@outlook.com> | 2017-08-06 09:46:52 +0200 |
| commit | b90beeb4d366e3ab584757c7965ee06e55bd3c95 (patch) | |
| tree | 3b3b4cea52f1d24627b0eb251fc1223e14ad9800 /tests | |
| parent | 9d59fa5a8ac85f0699daeb51f8602b7d01d31882 (diff) | |
Don't quote identifiers that coïncide with non-reserved keywords
Keep track of which keywords are reserved, and quote identifiers
that coïncide with those.
https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/metadata.py | 2 | ||||
| -rw-r--r-- | tests/test_smart_completion_multiple_schemata.py | 8 | ||||
| -rw-r--r-- | tests/test_smart_completion_public_schema_only.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/metadata.py b/tests/metadata.py index 91832162..9aa95953 100644 --- a/tests/metadata.py +++ b/tests/metadata.py @@ -13,7 +13,7 @@ no_qual = ['if_more_than_one_table', 'never'] def escape(name): - if not name.islower() or name in ('select', 'insert'): + if not name.islower() or name in ('select', 'localtimestamp'): return '"' + name + '"' return name diff --git a/tests/test_smart_completion_multiple_schemata.py b/tests/test_smart_completion_multiple_schemata.py index dba95ad2..5935af99 100644 --- a/tests/test_smart_completion_multiple_schemata.py +++ b/tests/test_smart_completion_multiple_schemata.py @@ -9,7 +9,7 @@ metadata = { 'public': { 'users': ['id', 'email', 'first_name', 'last_name'], 'orders': ['id', 'ordered_date', 'status', 'datestamp'], - 'select': ['id', 'insert', 'ABC'] + 'select': ['id', 'localtime', 'ABC'] }, 'custom': { 'users': ['id', 'phone_number'], @@ -364,7 +364,7 @@ def test_wildcard_column_expansion_with_table_qualifier(completer): completions = get_result(completer, text, position) - col_list = 'id, "select"."insert", "select"."ABC"' + col_list = 'id, "select"."localtime", "select"."ABC"' expected = [wildcard_expansion(col_list)] assert expected == completions @@ -377,7 +377,7 @@ def test_wildcard_column_expansion_with_two_tables(completer): completions = get_result(completer, text, position) - cols = ('"select".id, "select"."insert", "select"."ABC", ' + cols = ('"select".id, "select"."localtime", "select"."ABC", ' 'users.id, users.phone_number') expected = [wildcard_expansion(cols)] assert completions == expected @@ -390,7 +390,7 @@ def test_wildcard_column_expansion_with_two_tables_and_parent(completer): completions = get_result(completer, text, position) - col_list = 'id, "select"."insert", "select"."ABC"' + col_list = 'id, "select"."localtime", "select"."ABC"' expected = [wildcard_expansion(col_list)] assert expected == completions diff --git a/tests/test_smart_completion_public_schema_only.py b/tests/test_smart_completion_public_schema_only.py index a8130b1b..8da332f6 100644 --- a/tests/test_smart_completion_public_schema_only.py +++ b/tests/test_smart_completion_public_schema_only.py @@ -724,7 +724,7 @@ def test_wildcard_column_expansion_with_two_tables(completer): completions = get_result(completer, text, position) - cols = ('"select".id, "select"."insert", "select"."ABC", ' + cols = ('"select".id, "select".insert, "select"."ABC", ' 'u.id, u.parentid, u.email, u.first_name, u.last_name') expected = [wildcard_expansion(cols)] assert completions == expected @@ -737,7 +737,7 @@ def test_wildcard_column_expansion_with_two_tables_and_parent(completer): completions = get_result(completer, text, position) - col_list = 'id, "select"."insert", "select"."ABC"' + col_list = 'id, "select".insert, "select"."ABC"' expected = [wildcard_expansion(col_list)] assert expected == completions |