diff --git a/src/metabase/models/field_values.clj b/src/metabase/models/field_values.clj index 4ee8dbf8745ded52e980b07c48824dbc4f67b9e8..b7cb48345a8d0e4441ab9f44070b08d596dfdb99 100644 --- a/src/metabase/models/field_values.clj +++ b/src/metabase/models/field_values.clj @@ -424,8 +424,8 @@ created/updated/deleted as a result of this call. Note that if the full FieldValues are create/updated/deleted, it'll delete all the Advanced FieldValues of the same `field`." - [field & [human-readable-values]] - (let [field-values (get-latest-full-field-values (u/the-id field)) + [field & {:keys [field-values human-readable-values]}] + (let [field-values (or field-values (get-latest-full-field-values (u/the-id field))) {unwrapped-values :values :keys [has_more_values]} (distinct-values field) ;; unwrapped-values are 1-tuples, so we need to unwrap their values for storage @@ -497,7 +497,7 @@ (when (field-should-have-field-values? field) (let [existing (or (not-empty field-values) (get-latest-full-field-values field-id))] (if (or (not existing) (inactive? existing)) - (case (create-or-update-full-field-values! field human-readable-values) + (case (create-or-update-full-field-values! field :human-readable-values human-readable-values) ::fv-deleted nil diff --git a/src/metabase/sync/field_values.clj b/src/metabase/sync/field_values.clj index b3d104f6011b751e389514ba19fd202b96b4dd8d..81a116261dd7622530043fff32fe265d6c1d9523 100644 --- a/src/metabase/sync/field_values.clj +++ b/src/metabase/sync/field_values.clj @@ -29,7 +29,7 @@ (if (field-values/inactive? field-values) (log/debugf "Field %s has not been used since %s. Skipping..." (sync-util/name-for-logging field) (t/format "yyyy-MM-dd" (t/local-date-time (:last_used_at field-values)))) - (field-values/create-or-update-full-field-values! field)))) + (field-values/create-or-update-full-field-values! field :field-values field-values)))) (defn- update-field-value-stats-count [counts-map result] (if (instance? Exception result)