Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Filter out inactive tables for metabot (#70440)

Noah Mossa6c90cc7ff11
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/table_utils.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/table_utils.clj
index 36a1dcdb2f2..acf4715aff1 100644
--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/table_utils.clj
+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/table_utils.clj
@@ -244,7 +244,8 @@
queried-tables (->> analysis-result
:tables
(map #(set/rename-keys % {:table :name, :table-id :id})))
- {recognized-tables true, unrecognized-tables false} (group-by t2/instance? queried-tables)]
+ {recognized-tables true, unrecognized-tables false} (group-by t2/instance? queried-tables)
+ recognized-tables (used-tables-from-ids database (keep :id recognized-tables))]
(concat recognized-tables
(find-matching-tables database unrecognized-tables (map :id recognized-tables)))))
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj
index bc857546d7f..ca3a2f3cf6b 100644
--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj
+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj
@@ -157,7 +157,9 @@
(defn get-table
"Get the `fields` of the table with ID `id`."
[id & fields]
- (-> (t2/select-one (into [:model/Table :id] fields) id)
+ (-> (t2/select-one (into [:model/Table :id] fields)
+ :id id
+ :active true)
api/read-check))
(defn get-card
diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/table_utils_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_v3/table_utils_test.clj
index cded3402cbe..857a09d3cfb 100644
--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/table_utils_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/metabot_v3/table_utils_test.clj
@@ -163,7 +163,8 @@
(testing "used-tables function"
(mt/with-temp [:model/Database {db-id :id :as db} {}
:model/Table {table1-id :id} {:db_id db-id, :name "users", :schema "public", :active true, :visibility_type nil}
- :model/Table {} {:db_id db-id, :name "orders", :schema "public", :active true, :visibility_type nil}]
+ :model/Table {} {:db_id db-id, :name "orders", :schema "public", :active true, :visibility_type nil}
+ :model/Table {inactive-id :id} {:db_id db-id, :name "inactive_users", :schema "public", :active false, :visibility_type nil}]
(testing "handles query with recognized tables"
(mt/with-current-user (mt/user->id :crowberto)
@@ -209,7 +210,14 @@
(lib/native-query (mt/metadata-provider) "SELECT * FROM users JOIN order ON ..."))
tables (table-utils/used-tables query)]
(is (>= (count tables) 1)) ; At least the recognized table
- (is (some #(= table1-id (:id %)) tables)))))))))
+ (is (some #(= table1-id (:id %)) tables))))))
+
+ (testing "filters out recognized inactive tables"
+ (mt/with-current-user (mt/user->id :crowberto)
+ (let [query (mt/with-db db
+ (lib/native-query (mt/metadata-provider) "SELECT * FROM inactive_users"))
+ tables (table-utils/used-tables query)]
+ (is (not-any? #(= inactive-id (:id %)) tables))))))))
(deftest used-tables-from-ids-test
(testing "used-tables-from-ids function"
diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/util_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/util_test.clj
index 1f4d83c360b..a666a4837eb 100644
--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/util_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/util_test.clj
@@ -172,6 +172,16 @@
(is (every? verified-ids (take 2 ordered-ids)))
(is (every? unverified-ids (drop 2 ordered-ids))))))))))))
+(deftest get-table-filters-inactive-test
+ (testing "get-table only returns active tables"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {active-table-id :id} {:db_id db-id, :name "active_table", :active true, :visibility_type nil}
+ :model/Table {inactive-table-id :id} {:db_id db-id, :name "inactive_table", :active false, :visibility_type nil}]
+ (mt/with-current-user (mt/user->id :crowberto)
+ (is (= active-table-id (:id (metabot-v3.tools.util/get-table active-table-id))))
+ (is (thrown? clojure.lang.ExceptionInfo
+ (metabot-v3.tools.util/get-table inactive-table-id)))))))
+
(deftest parse-field-id-test
(testing "parse-field-id parses valid field IDs correctly"
(testing "table field IDs with numeric table ID"