From ccedbea506dbe4ff4cda475d31c9d7ec7b5282fc Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Thu, 18 Jul 2019 13:17:26 -0700 Subject: [PATCH] [fix] Adding space after -- for SQL comments (#7897) --- tests/model_tests.py | 6 +++--- tests/sql_parse_tests.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/model_tests.py b/tests/model_tests.py index febf1980656..7acd4b6b0e9 100644 --- a/tests/model_tests.py +++ b/tests/model_tests.py @@ -262,14 +262,14 @@ class SqlaTableModelTestCase(SupersetTestCase): extras={}, ) sql = tbl.get_query_str(query_obj) - self.assertNotIn("--COMMENT", sql) + self.assertNotIn("-- COMMENT", sql) def mutator(*args): - return "--COMMENT\n" + args[0] + return "-- COMMENT\n" + args[0] app.config["SQL_QUERY_MUTATOR"] = mutator sql = tbl.get_query_str(query_obj) - self.assertIn("--COMMENT", sql) + self.assertIn("-- COMMENT", sql) app.config["SQL_QUERY_MUTATOR"] = None diff --git a/tests/sql_parse_tests.py b/tests/sql_parse_tests.py index f9a12793d78..a7f925c5faa 100644 --- a/tests/sql_parse_tests.py +++ b/tests/sql_parse_tests.py @@ -449,13 +449,13 @@ class SupersetTestCase(unittest.TestCase): self.assertEquals({"SalesOrderHeader"}, self.extract_tables(query)) def test_get_query_with_new_limit_comment(self): - sql = "SELECT * FROM ab_user --SOME COMMENT" + sql = "SELECT * FROM ab_user -- SOME COMMENT" parsed = sql_parse.ParsedQuery(sql) newsql = parsed.get_query_with_new_limit(1000) self.assertEquals(newsql, sql + "\nLIMIT 1000") def test_get_query_with_new_limit_comment_with_limit(self): - sql = "SELECT * FROM ab_user --SOME COMMENT WITH LIMIT 555" + sql = "SELECT * FROM ab_user -- SOME COMMENT WITH LIMIT 555" parsed = sql_parse.ParsedQuery(sql) newsql = parsed.get_query_with_new_limit(1000) self.assertEquals(newsql, sql + "\nLIMIT 1000")