Use template string for dateIntervalQueryTpl

2017-09-04 18:42:30 +02:00
parent 7be5361433
commit 5ce419d863
1 changed files with 39 additions and 39 deletions
@@ -7,45 +7,45 @@ dot.templateSettings.strip = false;

 var columnCastTpl = dot.template("date_part('epoch', {{=it.column}})");

-var dateIntervalQueryTpl = dot.template([
-    'WITH',
-    '__cdb_dates AS (',
-    '    SELECT',
-    '        MAX({{=it.column}}::timestamp) AS __cdb_end,',
-    '        MIN({{=it.column}}::timestamp) AS __cdb_start',
-    '    FROM ({{=it.query}}) __cdb_source',
-    '),',
-    '__cdb_interval_in_days AS (',
-    '    SELECT' ,
-    '        DATE_PART(\'day\', __cdb_end - __cdb_start) AS __cdb_days',
-    '    FROM __cdb_dates',
-    '),',
-    '__cdb_interval_in_hours AS (',
-    '    SELECT',
-    '        __cdb_days * 24 + DATE_PART(\'hour\', __cdb_end - __cdb_start) AS __cdb_hours',
-    '    FROM __cdb_interval_in_days, __cdb_dates',
-    '),',
-    '__cdb_interval_in_minutes AS (',
-    '    SELECT',
-    '        __cdb_hours * 60 + DATE_PART(\'minute\', __cdb_end - __cdb_start) AS __cdb_minutes',
-    '    FROM __cdb_interval_in_hours, __cdb_dates',
-    '),',
-    '__cdb_interval_in_seconds AS (',
-    '    SELECT',
-    '        __cdb_minutes * 60 + DATE_PART(\'second\', __cdb_end - __cdb_start) AS __cdb_seconds',
-    '    FROM __cdb_interval_in_minutes, __cdb_dates',
-    ')',
-    'SELECT',
-    '    ROUND(__cdb_days / 365) AS year,',
-    '    ROUND(__cdb_days / 90) AS quarter,',
-    '    ROUND(__cdb_days / 30) AS month,',
-    '    ROUND(__cdb_days / 7) AS week,',
-    '    __cdb_days AS day,',
-    '    __cdb_hours AS hour,',
-    '    __cdb_minutes AS minute,',
-    '    __cdb_seconds AS second',
-    'FROM __cdb_interval_in_days, __cdb_interval_in_hours, __cdb_interval_in_minutes, __cdb_interval_in_seconds'
-].join('\n'));
+const dateIntervalQueryTpl = ctx => `
+    WITH
+    __cdb_dates AS (
+        SELECT
+            MAX(${ctx.column}::timestamp) AS __cdb_end
+            MIN(${ctx.column}::timestamp) AS __cdb_start
+        FROM (${ctx.query}) __cdb_source
+    ),
+    __cdb_interval_in_days AS (
+        SELECT
+            DATE_PART(\day\ __cdb_end - __cdb_start) AS __cdb_days
+        FROM __cdb_dates
+    ),
+    __cdb_interval_in_hours AS (
+        SELECT
+            __cdb_days * 24 + DATE_PART(\hour\ __cdb_end - __cdb_start) AS __cdb_hours
+        FROM __cdb_interval_in_days __cdb_dates
+    ),
+    __cdb_interval_in_minutes AS (
+        SELECT
+            __cdb_hours * 60 + DATE_PART(\minute\ __cdb_end - __cdb_start) AS __cdb_minutes
+        FROM __cdb_interval_in_hours __cdb_dates
+    ),
+    __cdb_interval_in_seconds AS (
+        SELECT
+            __cdb_minutes * 60 + DATE_PART(\second\ __cdb_end - __cdb_start) AS __cdb_seconds
+        FROM __cdb_interval_in_minutes __cdb_dates
+    ),
+    SELECT
+        ROUND(__cdb_days / 365) AS year
+        ROUND(__cdb_days / 90) AS quarter
+        ROUND(__cdb_days / 30) AS month
+        ROUND(__cdb_days / 7) AS week
+        __cdb_days AS day
+        __cdb_hours AS hour
+        __cdb_minutes AS minute
+        __cdb_seconds AS second
+    FROM __cdb_interval_in_days __cdb_interval_in_hours __cdb_interval_in_minutes __cdb_interval_in_seconds
+`;

 var MAX_INTERVAL_VALUE = 366;
 var BIN_MIN_NUMBER = 6;