You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2022/04/11 06:49:53 UTC
[superset] 01/01: fix tests
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 419316e84a67a77f87d82139e63357ad7b2ea6eb
Author: Ville Brofeldt <vi...@gmail.com>
AuthorDate: Mon Apr 11 09:49:29 2022 +0300
fix tests
---
superset/common/query_object_factory.py | 2 +-
superset/sql_parse.py | 1 -
superset/views/base.py | 2 +-
tests/integration_tests/sqla_models_tests.py | 47 ----------------------------
4 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/superset/common/query_object_factory.py b/superset/common/query_object_factory.py
index 0066346d8a..d38c114e1d 100644
--- a/superset/common/query_object_factory.py
+++ b/superset/common/query_object_factory.py
@@ -79,7 +79,7 @@ class QueryObjectFactory: # pylint: disable=too-few-public-methods
str(datasource["type"]), int(datasource["id"]), self._session_maker()
)
- def _process_extras( # pylint: disable=no-self-use
+ def _process_extras(
self,
extras: Optional[Dict[str, Any]],
) -> Dict[str, Any]:
diff --git a/superset/sql_parse.py b/superset/sql_parse.py
index 6bfb63c425..e3b2e7c196 100644
--- a/superset/sql_parse.py
+++ b/superset/sql_parse.py
@@ -574,7 +574,6 @@ def get_rls_for_table(
return None
template_processor = dataset.get_template_processor()
- # pylint: disable=protected-access
predicate = " AND ".join(
str(filter_)
for filter_ in dataset.get_sqla_row_level_filters(template_processor)
diff --git a/superset/views/base.py b/superset/views/base.py
index 0131eedfbe..3024c4490d 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -630,7 +630,7 @@ class DatasourceFilter(BaseFilter): # pylint: disable=too-few-public-methods
)
-class CsvResponse(Response):
+class CsvResponse(Response): # pylint: disable=too-many-ancestors
"""
Override Response to take into account csv encoding from config.py
"""
diff --git a/tests/integration_tests/sqla_models_tests.py b/tests/integration_tests/sqla_models_tests.py
index d8c9c070c9..5f3d3cfe81 100644
--- a/tests/integration_tests/sqla_models_tests.py
+++ b/tests/integration_tests/sqla_models_tests.py
@@ -658,53 +658,6 @@ def test_filter_on_text_column(text_column_table):
assert result_object.df["count"][0] == 1
-def test_should_generate_closed_and_open_time_filter_range():
- with app.app_context():
- if backend() != "postgresql":
- pytest.skip(f"{backend()} has different dialect for datetime column")
-
- table = SqlaTable(
- table_name="temporal_column_table",
- sql=(
- "SELECT '2021-12-31'::timestamp as datetime_col "
- "UNION SELECT '2022-01-01'::timestamp "
- "UNION SELECT '2022-03-10'::timestamp "
- "UNION SELECT '2023-01-01'::timestamp "
- "UNION SELECT '2023-03-10'::timestamp "
- ),
- database=get_example_database(),
- )
- TableColumn(
- column_name="datetime_col",
- type="TIMESTAMP",
- table=table,
- is_dttm=True,
- )
- SqlMetric(metric_name="count", expression="count(*)", table=table)
- result_object = table.query(
- {
- "metrics": ["count"],
- "is_timeseries": False,
- "filter": [],
- "from_dttm": datetime(2022, 1, 1),
- "to_dttm": datetime(2023, 1, 1),
- "granularity": "datetime_col",
- }
- )
- """ >>> result_object.query
- SELECT count(*) AS count
- FROM
- (SELECT '2021-12-31'::timestamp as datetime_col
- UNION SELECT '2022-01-01'::timestamp
- UNION SELECT '2022-03-10'::timestamp
- UNION SELECT '2023-01-01'::timestamp
- UNION SELECT '2023-03-10'::timestamp) AS virtual_table
- WHERE datetime_col >= TO_TIMESTAMP('2022-01-01 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.US')
- AND datetime_col < TO_TIMESTAMP('2023-01-01 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.US')
- """
- assert result_object.df.iloc[0]["count"] == 2
-
-
@pytest.mark.parametrize(
"row,dimension,result",
[