From a9ba47fe120338326c3f897a38a6179ff6b6a217 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Mon, 21 Mar 2016 13:45:14 -0700 Subject: [PATCH 1/3] Add week ending and week start to grain --- dashed/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dashed/models.py b/dashed/models.py index 1db3fd62d12..0db91151a26 100644 --- a/dashed/models.py +++ b/dashed/models.py @@ -285,6 +285,10 @@ class Database(Model, AuditMixinNullable): Grain('Time Column', '{col}'), Grain('week', "date_trunc('week', CAST({col} AS DATE))"), Grain('month', "date_trunc('month', CAST({col} AS DATE))"), + Grain('week_ending', "date_add('day', 5, \ + date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))") + Grain('week_start', "date_add('day', -1, \ + date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))") ), 'mysql': ( Grain('Time Column', '{col}'), From 48c8a9024785e61ee9339aa783d94a8b9ff9de1b Mon Sep 17 00:00:00 2001 From: Siddharth Date: Mon, 21 Mar 2016 14:27:03 -0700 Subject: [PATCH 2/3] Fix multi-line statement --- dashed/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dashed/models.py b/dashed/models.py index 0db91151a26..c90b8add4ec 100644 --- a/dashed/models.py +++ b/dashed/models.py @@ -285,10 +285,10 @@ class Database(Model, AuditMixinNullable): Grain('Time Column', '{col}'), Grain('week', "date_trunc('week', CAST({col} AS DATE))"), Grain('month', "date_trunc('month', CAST({col} AS DATE))"), - Grain('week_ending', "date_add('day', 5, \ - date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))") - Grain('week_start', "date_add('day', -1, \ - date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))") + Grain("week_ending", "date_add('day', 5, " + "date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))"), + Grain("week_start", "date_add('day', -1, " + "date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))") ), 'mysql': ( Grain('Time Column', '{col}'), From bad3128df9562582b6fc3c1995ddbaba196f2d61 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Mon, 21 Mar 2016 15:41:49 -0700 Subject: [PATCH 3/3] Update grain label name --- dashed/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dashed/models.py b/dashed/models.py index c90b8add4ec..025806ad041 100644 --- a/dashed/models.py +++ b/dashed/models.py @@ -285,9 +285,9 @@ class Database(Model, AuditMixinNullable): Grain('Time Column', '{col}'), Grain('week', "date_trunc('week', CAST({col} AS DATE))"), Grain('month', "date_trunc('month', CAST({col} AS DATE))"), - Grain("week_ending", "date_add('day', 5, " + Grain("week_ending_saturday", "date_add('day', 5, " "date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))"), - Grain("week_start", "date_add('day', -1, " + Grain("week_start_sunday", "date_add('day', -1, " "date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))") ), 'mysql': (