add query optimizations from um-13

queries/analytics/event/getEventMetrics.js

@@ -1,4 +1,4 @@
-import { getDateQuery, getFilterQuery, rawQuery } from 'lib/queries';
+import { getDateQuery, getDateStringQuery, getFilterQuery, rawQuery } from 'lib/queries';
 
 export function getEventMetrics(
   website_id,
@@ -14,7 +14,7 @@ export function getEventMetrics(
     `
     select
       event_value x,
-      ${getDateQuery('created_at', unit, timezone)} t,
+      ${getDateStringQuery(getDateQuery('created_at', unit, timezone), unit)} t,
       count(*) y
     from event
     where website_id=$1

queries/analytics/pageview/getPageviewStats.js

@@ -1,4 +1,4 @@
-import { parseFilters, rawQuery, getDateQuery } from 'lib/queries';
+import { parseFilters, rawQuery, getDateQuery, getDateStringQuery } from 'lib/queries';
 
 export function getPageviewStats(
   website_id,
@@ -14,15 +14,19 @@ export function getPageviewStats(
 
   return rawQuery(
     `
-    select ${getDateQuery('pageview.created_at', unit, timezone)} t,
-      count(${count}) y
-    from pageview
-      ${joinSession}
-    where pageview.website_id=$1
-    and pageview.created_at between $2 and $3
-    ${pageviewQuery}
-    ${sessionQuery}
-    group by 1
+    select
+      ${getDateStringQuery('g.t', unit)} as t, 
+      g.y as y
+    from
+      (select ${getDateQuery('pageview.created_at', unit, timezone)} t,
+        count(${count}) y
+      from pageview
+        ${joinSession}
+      where pageview.website_id=$1
+      and pageview.created_at between $2 and $3
+      ${pageviewQuery}
+      ${sessionQuery}
+      group by 1) g
     order by 1
     `,
     params,