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
fix metabot sql tools incorrectly checked query type (#71428)
Oleksandr Solovyovce15b2d9f078
diff --git a/CLAUDE.md b/CLAUDE.mdindex ac0ac3d8923..b3a2beefc3b 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -6,7 +6,7 @@ For detailed guidance on writing and reviewing code and documentation, see the s## Clojure-- **[clojure-eval](.claude/skills/clojure-eval/SKILL.md)** - Always use this to evaluate Clojure code, **run tests**, and verify edits/compile. Prefer this over `clojure -X:...` shell commands.+- **[clojure-eval](.claude/skills/clojure-eval/SKILL.md)** - Always use this to evaluate Clojure code, **run tests**, and verify edits/compile. Prefer this over shell commands.- **[clojure-write](.claude/skills/clojure-write/SKILL.md)** - Clojure/ClojureScript development with REPL-driven workflow and coding conventions- **[clojure-review](.claude/skills/clojure-review/SKILL.md)** - Clojure/ClojureScript code review guidelines and style enforcementdiff --git a/src/metabase/metabot/tools/shared/llm_representations.clj b/src/metabase/metabot/tools/shared/llm_representations.cljindex 3ab201271f8..19c0ccdb278 100644--- a/src/metabase/metabot/tools/shared/llm_representations.clj+++ b/src/metabase/metabot/tools/shared/llm_representations.clj@@ -3,6 +3,7 @@Matches Python AI Service patterns exactly for consistency."(:require[clojure.string :as str]+ [metabase.lib.schema :as lib.schema][metabase.metabot.agent.prompts :as prompts][metabase.metabot.tmpl :as te][metabase.util :as u]@@ -244,7 +245,9 @@as query-type \"sql\"."[{:keys [query-type result-type query-id database database_id query query-content result]}](let [qtype (or query-type- (when (= :native (:type query)) "sql")+ (when (or (= :native (:type query))+ (lib.schema/native-only-query? query))+ "sql")(when result-type (name result-type))"unknown")](render-llm-templatediff --git a/src/metabase/metabot/tools/sql/common.clj b/src/metabase/metabot/tools/sql/common.cljindex 2b5bfdb1e35..ddf90fdec21 100644--- a/src/metabase/metabot/tools/sql/common.clj+++ b/src/metabase/metabot/tools/sql/common.clj@@ -11,6 +11,7 @@- `edit-sql-query`,- `replace-sql-query`."(:require+ [metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.metabot.tools.sql.validation :as metabot.tools.sql.validation][metabase.util.i18n :refer [tru]]@@ -36,17 +37,29 @@[:validation-result ::metabot.tools.sql.validation/validation-result][:action-result {:optional true} ::action-result]])+(defn- maybe-normalize-query+ [query]+ (try+ (lib-be/normalize-query query)+ (catch Exception _+ nil)))+(defn update-query-sql- "Update a dataset_query map with new SQL content."+ "Update a dataset_query map with new SQL content.+ Handles both legacy MBQL (`{:type :native, :native {:query ...}}`) and+ pMBQL (`{:stages [{:lib/type :mbql.stage/native, :native ...}]}`) formats,+ including the JSON-serialized pMBQL variant where enum values are strings."[query new-sql]- (cond- (and (lib/native-only-query? query)- (string? (not-empty new-sql)))- (lib/with-native-query query new-sql)+ (let [normalized (maybe-normalize-query query)]+ (cond+ (and normalized+ (lib/native-only-query? normalized)+ (string? (not-empty new-sql)))+ (lib/with-native-query normalized new-sql)- (:native query)- (assoc-in query [:native :query] new-sql)+ (:native query)+ (assoc-in query [:native :query] new-sql)- :else- (throw (ex-info (tru "Unsupported query format")- {:agent-error? true}))))+ :else+ (throw (ex-info (tru "Unsupported query format")+ {:agent-error? true})))))diff --git a/test/metabase/metabot/tools/sql/tools_test.clj b/test/metabase/metabot/tools/sql/tools_test.cljindex 31f41c4707f..6714040de57 100644--- a/test/metabase/metabot/tools/sql/tools_test.clj+++ b/test/metabase/metabot/tools/sql/tools_test.clj@@ -4,6 +4,7 @@[clojure.string :as str][clojure.test :refer :all][metabase.lib.core :as lib]+ [metabase.metabot.tools.sql.common :as sql-common][metabase.metabot.tools.sql.create :as create-sql-query][metabase.metabot.tools.sql.edit :as edit-sql-query][metabase.metabot.tools.sql.replace :as replace-sql-query]@@ -12,7 +13,7 @@(deftest edit-sql-query-test(mt/test-drivers #{:h2}(mt/with-current-user (mt/user->id :crowberto)- (mt/with-temp [:model/Database db {:engine :h2}]+ (mt/with-temp [:model/Database {db-id :id :as db} {:engine :h2}](mt/with-db db(testing "single replacement edit"(let [mp (mt/metadata-provider)@@ -30,6 +31,23 @@(is (= query-id (:query-id result)))(is (= "SELECT * FROM users WHERE id = 2" (:query-content result)))))+ (testing "edit with JSON-parsed pMBQL query (string enum values)"+ (let [original-sql "SELECT * FROM users WHERE id = 1"+ query-id "q-pmbql"+ ;; Simulates JSON round-tripped pMBQL: keyword keys, string values+ queries-state {query-id {:lib/type "mbql/query"+ :database db-id+ :stages [{:lib/type "mbql.stage/native"+ :native original-sql}]}}+ {result :action-result}+ (edit-sql-query/edit-sql-query+ {:query-id query-id+ :queries-state queries-state+ :edits [{:old_string "id = 1"+ :new_string "id = 2"}]})]+ (is (= query-id (:query-id result)))+ (is (= "SELECT * FROM users WHERE id = 2" (:query-content result)))))+(testing "replace-all edit"(let [mp (mt/metadata-provider)original-sql "SELECT id, id FROM users WHERE id = 1"@@ -83,6 +101,22 @@(is (= new-sql (:query-content result)))(is (= db-id (:database result)))))+ (testing "replace with JSON-parsed pMBQL query (string enum values)"+ (let [original-sql "SELECT * FROM users"+ new-sql "SELECT id, name FROM customers"+ query-id "q-pmbql-replace"+ queries-state {query-id {:lib/type "mbql/query"+ :database db-id+ :stages [{:lib/type "mbql.stage/native"+ :native original-sql}]}}+ {result :action-result}+ (replace-sql-query/replace-sql-query+ {:query-id query-id+ :queries-state queries-state+ :sql new-sql})]+ (is (= new-sql (:query-content result)))+ (is (= db-id (:database result)))))+(testing "replaces SQL and updates name/description"(let [mp (mt/metadata-provider)query-id "q6"@@ -99,6 +133,33 @@(is (= "SELECT 2" (:query-content result)))(is (= db-id (:database result))))))))))+(deftest update-query-sql-with-json-pmbql-test+ (mt/test-drivers #{:h2}+ (mt/with-temp [:model/Database {db-id :id} {:engine :h2}]+ (testing "pMBQL query with string enum values (as received from frontend JSON)"+ ;; Simulates what cheshire/decode+kw produces: keyword keys but string values+ ;; for enum-like fields such as :lib/type.+ (let [json-pmbql {:lib/type "mbql/query"+ :database db-id+ :stages [{:lib/type "mbql.stage/native"+ :native "SELECT 1"}]}+ result (sql-common/update-query-sql json-pmbql "SELECT 2")]+ (is (lib/native-only-query? result))+ (is (= "SELECT 2" (lib/raw-native-query result)))))+ (testing "already-normalized pMBQL query"+ (let [mp (mt/metadata-provider)+ pmbql (lib/native-query mp "SELECT 1")+ result (sql-common/update-query-sql pmbql "SELECT 2")]+ (is (lib/native-only-query? result))+ (is (= "SELECT 2" (lib/raw-native-query result)))))+ (testing "legacy MBQL query"+ (let [legacy {:type :native+ :native {:query "SELECT 1"}+ :database db-id}+ result (sql-common/update-query-sql legacy "SELECT 2")]+ (is (lib/native-only-query? result))+ (is (= "SELECT 2" (lib/raw-native-query result))))))))+(deftest integration-create-edit-in-memory-test(mt/test-drivers #{:h2}(mt/with-current-user (mt/user->id :crowberto)