Bump fingerprint version, update tests

src/metabase/sync/analyze/classifiers/category.clj

@@ -47,8 +47,9 @@
 
 (s/defn ^:private field-should-be-auto-list? :- (s/maybe s/Bool)
   "Based on `distinct-count`, should we mark this `field` as `has_field_values` = `auto-list`?"
-  [fingerprint :- (s/maybe i/Fingerprint), field :- {:has_field_values (s/maybe (apply s/enum field/has-field-values-options))
-                                      s/Keyword         s/Any}]
+  [fingerprint :- (s/maybe i/Fingerprint),
+   field :- {(s/optional-key :has_field_values) (s/maybe (apply s/enum field/has-field-values-options))
+             s/Keyword         s/Any}]
   ;; only update has_field_values if it hasn't been set yet. If it's already been set then it was probably done so
   ;; manually by an admin, and we don't want to stomp over their choices.
   (let [distinct-count (get-in fingerprint [:global :distinct-count])]

src/metabase/sync/interface.clj

@@ -165,7 +165,8 @@
    time we do analysis. The highest-numbered entry is considered the latest version of fingerprints."
   {1 #{:type/*}
    2 #{:type/Number}
-   3 #{:type/DateTime}})
+   3 #{:type/DateTime}
+   4 #{:type/*}})
 
 (def latest-fingerprint-version
   "The newest (highest-numbered) version of our Field fingerprints."

test/metabase/sync/analyze/classifiers/category_test.clj

@@ -25,12 +25,10 @@
 ;; make sure the logic for deciding whether a Field should be a list works as expected
 (expect
   nil
-  (#'category-classifier/field-should-be-auto-list?
-   2500
-   (field-with-distinct-count 2500)))
+  (let [field (field-with-distinct-count 2500)]
+    (#'category-classifier/field-should-be-auto-list? (:fingerprint field) field)))
 
 (expect
   true
-  (#'category-classifier/field-should-be-auto-list?
-   99
-   (field-with-distinct-count 99)))
+  (let [field (field-with-distinct-count 99)]
+    (#'category-classifier/field-should-be-auto-list? (:fingerprint field) field)))

test/metabase/sync/field_values_test.clj

@@ -26,7 +26,7 @@
 (expect
   {1 [1 2 3 4]
    2 nil
-   3 (repeat 2 {:errors 0, :created 1, :updated 5, :deleted 0})
+   3 (repeat 2 {:errors 0, :created 1, :updated 0, :deleted 0})
    4 [1 2 3 4]}
   {;; 1. Check that we have expected field values to start with
    1 (venues-price-field-values)
@@ -43,7 +43,7 @@
 (expect
   {1 [1 2 3 4]
    2 [1 2 3]
-   3 (repeat 2 {:errors 0, :created 0, :updated 6, :deleted 0})
+   3 (repeat 2 {:errors 0, :created 0, :updated 1, :deleted 0})
    4 [1 2 3 4]}
   { ;; 1. Check that we have expected field values to start with
    1 (venues-price-field-values)