From 9eb911dca38d555ae50bf47b959868d1d92880e8 Mon Sep 17 00:00:00 2001 From: Yongjie Zhao Date: Thu, 7 Jan 2021 02:09:13 +0800 Subject: [PATCH] fix(explore): refine previous calendar range (#12308) --- superset/utils/core.py | 6 +++--- tests/utils_tests.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/superset/utils/core.py b/superset/utils/core.py index 3723a4c80..c500c197a 100644 --- a/superset/utils/core.py +++ b/superset/utils/core.py @@ -1502,19 +1502,19 @@ def get_since_until( and time_range.startswith("previous calendar week") and separator not in time_range ): - time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, WEEK), WEEK) : LASTDAY(DATEADD(DATETIME('today'), -1, WEEK), WEEK)" # pylint: disable=line-too-long + time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, WEEK), WEEK) : DATETRUNC(DATETIME('today'), WEEK)" # pylint: disable=line-too-long if ( time_range and time_range.startswith("previous calendar month") and separator not in time_range ): - time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, MONTH), MONTH) : LASTDAY(DATEADD(DATETIME('today'), -1, MONTH), MONTH)" # pylint: disable=line-too-long + time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, MONTH), MONTH) : DATETRUNC(DATETIME('today'), MONTH)" # pylint: disable=line-too-long if ( time_range and time_range.startswith("previous calendar year") and separator not in time_range ): - time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, YEAR), YEAR) : LASTDAY(DATEADD(DATETIME('today'), -1, YEAR), YEAR)" # pylint: disable=line-too-long + time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, YEAR), YEAR) : DATETRUNC(DATETIME('today'), YEAR)" # pylint: disable=line-too-long if time_range and separator in time_range: time_range_lookup = [ diff --git a/tests/utils_tests.py b/tests/utils_tests.py index 98f70ba95..20c78972b 100644 --- a/tests/utils_tests.py +++ b/tests/utils_tests.py @@ -762,15 +762,15 @@ class TestUtils(SupersetTestCase): self.assertEqual(result, expected) result = get_since_until("previous calendar week") - expected = datetime(2016, 10, 31, 0, 0, 0), datetime(2016, 11, 6, 0, 0, 0) + expected = datetime(2016, 10, 31, 0, 0, 0), datetime(2016, 11, 7, 0, 0, 0) self.assertEqual(result, expected) result = get_since_until("previous calendar month") - expected = datetime(2016, 10, 1, 0, 0, 0), datetime(2016, 10, 31, 0, 0, 0) + expected = datetime(2016, 10, 1, 0, 0, 0), datetime(2016, 11, 1, 0, 0, 0) self.assertEqual(result, expected) result = get_since_until("previous calendar year") - expected = datetime(2015, 1, 1, 0, 0, 0), datetime(2015, 12, 31, 0, 0, 0) + expected = datetime(2015, 1, 1, 0, 0, 0), datetime(2016, 1, 1, 0, 0, 0) self.assertEqual(result, expected) with self.assertRaises(ValueError):