[feature] deleting envs from .gitignore, creating test for SQL-Hints

skryzh · andialbrecht · commit 2f9c7ec38f98 · 2024-11-14T10:01:54.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,3 @@ MANIFEST
 *.egg-info/
 htmlcov/
 .pytest_cache
-**/.vscode
-**/.env
diff --git a/sqlparse/filters/others.py b/sqlparse/filters/others.py
@@ -47,7 +47,7 @@ def _get_insert_token(token):
             if is_sql_hint:
                 # using current index as start index to search next token for
                 # preventing infinite loop in cases when token type is a
-                # "SQL-Hint"and has to be skipped
+                # "SQL-Hint" and has to be skipped
                 tidx, token = get_next_comment(idx=tidx)
                 continue
 
@@ -70,7 +70,7 @@ def _get_insert_token(token):
 
             # using current index as start index to search next token for
             # preventing infinite loop in cases when token type is a
-            # "SQL-Hint"and has to be skipped
+            # "SQL-Hint" and has to be skipped
             tidx, token = get_next_comment(idx=tidx)
 
     def process(self, stmt):
diff --git a/tests/test_format.py b/tests/test_format.py
@@ -61,19 +61,6 @@ def test_strip_comments_single(self):
               'from foo--comment\nf'
         res = sqlparse.format(sql, strip_comments=True)
         assert res == 'select a\nfrom foo\nf'
-        # SQL-Hints have to be preserved
-        sql = 'select --+full(u)'
-        res = sqlparse.format(sql, strip_comments=True)
-        assert res == sql
-        sql = '#+ hint\nselect * from foo'
-        res = sqlparse.format(sql, strip_comments=True)
-        assert res == sql
-        sql = 'select --+full(u)\n--comment simple'
-        res = sqlparse.format(sql, strip_comments=True)
-        assert res == 'select --+full(u)\n'
-        sql = '#+ hint\nselect * from foo\n# comment simple'
-        res = sqlparse.format(sql, strip_comments=True)
-        assert res == '#+ hint\nselect * from foo\n'
 
     def test_strip_comments_invalid_option(self):
         sql = 'select-- foo\nfrom -- bar\nwhere'
@@ -96,13 +83,6 @@ def test_strip_comments_multi(self):
         sql = 'select (/* sql /* starts here */ select 2)'
         res = sqlparse.format(sql, strip_comments=True, strip_whitespace=True)
         assert res == 'select (select 2)'
-        # SQL-Hints have to be preserved
-        sql = 'SELECT /*+cluster(T)*/* FROM T_EEE T where A >:1'
-        res = sqlparse.format(sql, strip_comments=True)
-        assert res == sql
-        sql = 'insert /*+ DIRECT */ into sch.table_name as select * from foo'
-        res = sqlparse.format(sql, strip_comments=True)
-        assert res == sql
 
     def test_strip_comments_preserves_linebreak(self):
         sql = 'select * -- a comment\r\nfrom foo'
@@ -126,6 +106,26 @@ def test_strip_comments_preserves_whitespace(self):
         res = sqlparse.format(sql, strip_comments=True)
         assert res == 'SELECT 1 AS foo'
 
+    def test_strip_comments_preserves_hint(self):
+        sql = 'select --+full(u)'
+        res = sqlparse.format(sql, strip_comments=True)
+        assert res == sql
+        sql = '#+ hint\nselect * from foo'
+        res = sqlparse.format(sql, strip_comments=True)
+        assert res == sql
+        sql = 'select --+full(u)\n--comment simple'
+        res = sqlparse.format(sql, strip_comments=True)
+        assert res == 'select --+full(u)\n'
+        sql = '#+ hint\nselect * from foo\n# comment simple'
+        res = sqlparse.format(sql, strip_comments=True)
+        assert res == '#+ hint\nselect * from foo\n'
+        sql = 'SELECT /*+cluster(T)*/* FROM T_EEE T where A >:1'
+        res = sqlparse.format(sql, strip_comments=True)
+        assert res == sql
+        sql = 'insert /*+ DIRECT */ into sch.table_name as select * from foo'
+        res = sqlparse.format(sql, strip_comments=True)
+        assert res == sql
+
     def test_strip_ws(self):
         f = lambda sql: sqlparse.format(sql, strip_whitespace=True)
         s = 'select\n* from      foo\n\twhere  ( 1 = 2 )\n'
