Merge branch 'release-0.35.x' into merge-master

frontend/src/metabase-lib/lib/Dimension.js

@@ -625,7 +625,9 @@ import { DATETIME_UNITS, formatBucketing } from "metabase/lib/query_time";
 import type Aggregation from "./queries/structured/Aggregation";
 
 const isFieldDimension = dimension =>
-  dimension instanceof FieldIDDimension || dimension instanceof FKDimension;
+  dimension instanceof FieldIDDimension ||
+  dimension instanceof FKDimension ||
+  dimension instanceof FieldLiteralDimension;
 
 /**
  * DatetimeField dimension, `["datetime-field", field-reference, datetime-unit]`

frontend/src/metabase/modes/components/drill/SummarizeColumnByTimeDrill.js

@@ -50,6 +50,6 @@ export default ({
               ? [aggregator.short, fieldRefForColumn(column)]
               : [aggregator.short],
           )
-          .pivot([dateDimension.defaultDimension().mbql()]),
+          .pivot([dateDimension.defaultBreakout()]),
     }));
 };