The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Reindex search after the site locale change commits (#83303)
Andrei Simionescuc7f496ed8555
diff --git a/src/metabase/search/appdb/core.clj b/src/metabase/search/appdb/core.cljindex 7917e372451..0050c34cc49 100644--- a/src/metabase/search/appdb/core.clj+++ b/src/metabase/search/appdb/core.clj@@ -232,7 +232,9 @@(methodical/defmethod events/publish-event! ::settings-changed-event[_topic event](when (and (= :site-locale (-> event :details :key)) (= :postgres (mdb/db-type)))- (log/info "Reindexing appdb index because the site locale changed.")- (if search.ingestion/*force-sync*- (search.engine/reindex! :search.engine/appdb {})- (future (search.engine/reindex! :search.engine/appdb {})))))+ (let [reindex! (fn []+ (log/info "Reindexing appdb index because the site locale changed.")+ (search.engine/reindex! :search.engine/appdb {}))]+ (if search.ingestion/*force-sync*+ (reindex!)+ (mdb/do-after-commit #(future (reindex!)))))))diff --git a/test/metabase/search/appdb/core_test.clj b/test/metabase/search/appdb/core_test.cljnew file mode 100644index 00000000000..6e79c9bb181--- /dev/null+++ b/test/metabase/search/appdb/core_test.clj@@ -0,0 +1,40 @@+(ns metabase.search.appdb.core-test+ (:require+ [clojure.test :refer :all]+ [metabase.app-db.core :as mdb]+ [metabase.audit-app.events.audit-log]+ [metabase.events.core :as events]+ [metabase.search.appdb.core]+ [metabase.search.appdb.index :as search.index]+ [metabase.search.engine :as search.engine]+ [metabase.search.test-util :as search.tu]+ [metabase.test :as mt]+ [metabase.test.fixtures :as fixtures]+ [toucan2.connection :as t2.conn]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(comment metabase.audit-app.events.audit-log/keep-me)++(use-fixtures :once (fixtures/initialize :db :test-users))++(deftest locale-change-reindexes-after-commit-test+ (when (= :postgres (mdb/db-type))+ (let [reindex-connectable (promise)]+ (with-redefs [search.engine/reindex! (fn [& _] (deliver reindex-connectable t2.conn/*current-connectable*))]+ (t2/with-transaction [_conn]+ (events/publish-event! :event/setting-update {:details {:key :site-locale}})+ (is (not (realized? reindex-connectable))))+ (is (nil? (deref reindex-connectable 5000 ::timed-out)))))))++(deftest locale-change-rebuilds-the-index-in-the-new-language-test+ (when (= :postgres (mdb/db-type))+ (search.tu/with-temp-index-table+ (mt/with-temp [:model/Card _ {:name "Häuser"}]+ (search.engine/reindex! :search.engine/appdb {:in-place? true})+ (let [english-index (search.index/active-table)]+ (is (empty? (search.index/search "haus")))+ (mt/with-temporary-setting-values [site-locale "de"]+ (is (not= english-index (search.index/active-table)))+ (is (= [["card" "Häuser"]] (search.index/search "haus")))))))))