Remove sqlparse.compat import (#38) · databricks/databricks-sql-cli@f022940 · GitHub

databricks / databricks-sql-cli Public

• Notifications You must be signed in to change notification settings
• Fork 15
• Star 45

• Code
• Issues 24
• Pull requests 3
• Projects
• Security and quality
• Insights

Additional navigation options

Commit f022940

Browse filesBrowse the repository at this point in the historyBrowse files

kfollesdal

authored

Remove sqlparse.compat import (#38)

sqlparse do no longer have sqlparse.compat. It was removed in version 0.4. It is missing from GitHub source and sqlparse-0.4.2.tar.gz from PyPI. But it exist in sqlparse-0.4.2-py3-none-any.whl from PyPi for some strang reasone. Since databricks-sql-cli import 'text_type' form sqlparse.compat it will fail if you install sqlparse in any other way other than wheel. sqlparse was remooved in the following commit: andialbrecht/sqlparse@3e3892f 'text_type' was replaced with 'str' so we do the same in databricks-sql-cli.

1 parent 345ca09 commit f022940
Copy full SHA for f022940

1 file changed

+1-2Lines changed: 1 addition & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• dbsqlcli/packages
  • completion_engine.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎dbsqlcli/packages/completion_engine.py‎

Copy file name to clipboardExpand all lines: dbsqlcli/packages/completion_engine.py

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,6 @@
4	4	import logging
5	5	from collections import namedtuple
6	6	from sqlparse.sql import Comparison, Identifier, Where
7		- from sqlparse.compat import text_type
8	7
9	8	from dbsqlcli.packages.parseutils import last_word, extract_tables, find_prev_keyword
10	9	from dbsqlcli.packages.special import parse_special_command
@@ -78,7 +77,7 @@ def suggest_type(full_text, text_before_cursor):
78	77	stmt_start, stmt_end = 0, 0
79	78
80	79	for statement in parsed:
81		- stmt_len = len(text_type(statement))
	80	+ stmt_len = len(str(statement))
82	81	stmt_start, stmt_end = stmt_end, stmt_end + stmt_len
83	82
84	83	if stmt_end >= current_pos:

0 commit comments

Comments

0 (0)