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 formatting for `native-query` (#64291)
Cam Saul8fa9204d5785
diff --git a/.cljfmt.edn b/.cljfmt.ednindex c3c53fa34cd..ca483e1ba55 100644--- a/.cljfmt.edn+++ b/.cljfmt.edn@@ -232,7 +232,6 @@metabase.test.data/$ids [[:inner 0]]metabase.test.data/dataset [[:inner 0]]metabase.test.data/mbql-query [[:inner 0]]- metabase.test.data/native-query [[:block 0]]metabase.test.data/query [[:block 1]]metabase.test.data/run-mbql-query [[:inner 0]]metabase.test.data/with-empty-h2-app-db! [[:block 0]]@@ -253,7 +252,6 @@metabase.test/format-rows-by [[:default]]metabase.test/let-url [[:block 1]]metabase.test/mbql-query [[:inner 0]]- metabase.test/native-query [[:block 0]]metabase.test/query [[:block 1]]metabase.test/run-mbql-query [[:inner 0]]metabase.test/test-driver [[:inner 0]]diff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/block_permissions_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/block_permissions_test.cljindex 285bfcd35dc..cbf9829b590 100644--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/block_permissions_test.clj+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/block_permissions_test.clj@@ -572,11 +572,11 @@(mt/with-temp [:model/Card {card-1-id :id, :as card-1} {:collection_id (u/the-id collection):dataset_query card-1-query}](let [card-2-query (mt/native-query- {:query "SELECT * FROM {{card}}"- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-1-id}}})]+ {:query "SELECT * FROM {{card}}"+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-1-id}}})](mt/with-temp [:model/Card card-2 {:collection_id (u/the-id collection):dataset_query card-2-query}](testing "should be able to read nested-nested Card if we have Collection permissions"@@ -625,10 +625,10 @@(mt/with-temp [:model/Collection collection](perms/grant-collection-read-permissions! (perms/all-users-group) collection)(let [card-1-query (mt/native-query- {:query (str "SELECT id, name, category_id, latitude, longitude, price "- "FROM venues "- "ORDER BY id ASC "- "LIMIT 2")})]+ {:query (str "SELECT id, name, category_id, latitude, longitude, price "+ "FROM venues "+ "ORDER BY id ASC "+ "LIMIT 2")})](mt/with-temp [:model/Card {card-1-id :id, :as card-1} {:collection_id (u/the-id collection):dataset_query card-1-query}](let [card-2-query (mt/mbql-query nildiff --git a/enterprise/backend/test/metabase_enterprise/sandbox/api/field_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/api/field_test.cljindex 833739b07d8..a7606653015 100644--- a/enterprise/backend/test/metabase_enterprise/sandbox/api/field_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sandbox/api/field_test.clj@@ -32,11 +32,11 @@["native"{:gtaps {:venues {:query(mt/native-query- {:query "SELECT id, name, category_id FROM venues WHERE category_id = {{cat}}"- :template-tags {"cat" {:id "__MY_CAT__"- :name "cat"- :display-name "Cat id"- :type :number}}})+ {:query "SELECT id, name, category_id FROM venues WHERE category_id = {{cat}}"+ :template-tags {"cat" {:id "__MY_CAT__"+ :name "cat"+ :display-name "Cat id"+ :type :number}}}):remappings {:cat [:variable [:template-tag "cat"]]}}}:attributes {:cat 50}}]]](testing (format "GTAP rule is a %s query" query-type)diff --git a/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/sandboxing_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/sandboxing_test.cljindex 9622cd31699..d537a574ab0 100644--- a/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/sandboxing_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/sandboxing_test.clj@@ -88,17 +88,17 @@(driver/with-driver (or driver/*driver* :h2)(assert (driver.u/supports? driver/*driver* :native-parameters (mt/db))){:query (mt/native-query- {:query- (format-honeysql- {:select [:*]- :from [[(identifier :venues)]]- :where [:=- (identifier :venues :category_id)- [:raw "{{cat}}"]]- :order-by [[(identifier :venues :id) :asc]]})-- :template_tags- {:cat {:name "cat" :display_name "cat" :type "number" :required true}}})+ {:query+ (format-honeysql+ {:select [:*]+ :from [[(identifier :venues)]]+ :where [:=+ (identifier :venues :category_id)+ [:raw "{{cat}}"]]+ :order-by [[(identifier :venues :id) :asc]]})++ :template_tags+ {:cat {:name "cat" :display_name "cat" :type "number" :required true}}}):remappings {:cat ["variable" ["template-tag" "cat"]]}}))(defn- parameterized-sql-with-join-sandbox-def@@ -107,38 +107,38 @@(driver/with-driver (or driver/*driver* :h2)(assert (driver.u/supports? driver/*driver* :native-parameters (mt/db))){:query (mt/native-query- {:query- (format-honeysql- {:select [[(identifier :checkins :id)]- [(identifier :checkins :user_id)]+ {:query+ (format-honeysql+ {:select [[(identifier :checkins :id)]+ [(identifier :checkins :user_id)];; these columns are ILLEGAL, you're NOT allowed to add columns not in the original table.;; We should complain loudly and then ignore them.- [(identifier :venues :name)]- [(identifier :venues :category_id)]]- :from [[(identifier :checkins)]]- :left-join [[(identifier :venues)]- [:= (identifier :checkins :venue_id) (identifier :venues :id)]]- :where [:=- (identifier :checkins :user_id)- [:raw "{{user}}"]]- :order-by [[(identifier :checkins :id) :asc]]})-- :template_tags- {"user" {:name "user"- :display-name "User ID"- :type :number- :required true}}})+ [(identifier :venues :name)]+ [(identifier :venues :category_id)]]+ :from [[(identifier :checkins)]]+ :left-join [[(identifier :venues)]+ [:= (identifier :checkins :venue_id) (identifier :venues :id)]]+ :where [:=+ (identifier :checkins :user_id)+ [:raw "{{user}}"]]+ :order-by [[(identifier :checkins :id) :asc]]})++ :template_tags+ {"user" {:name "user"+ :display-name "User ID"+ :type :number+ :required true}}}):remappings {:user ["variable" ["template-tag" "user"]]}}))(defn- venue-names-native-sandbox-def [](driver/with-driver (or driver/*driver* :h2){:query (mt/native-query- {:query- (format-honeysql- {:select [[(identifier :venues :id)]- [(identifier :venues :name)]]- :from [[(identifier :venues)]]- :order-by [[(identifier :venues :id) :asc]]})})}))+ {:query+ (format-honeysql+ {:select [[(identifier :venues :id)]+ [(identifier :venues :name)]]+ :from [[(identifier :venues)]]+ :order-by [[(identifier :venues :id) :asc]]})})}))(defn- run-venues-count-query [](mt/format-rows-by@@ -599,13 +599,13 @@(fn [{:keys [cols expected-cols]}](testing "A query with an equivalent native query sandbox should have the same metadata"(met/with-gtaps! {:gtaps {:venues {:query (mt/native-query- {:query- (str "SELECT ID, NAME, CATEGORY_ID, LATITUDE, LONGITUDE, PRICE "- "FROM VENUES "- "WHERE CATEGORY_ID = {{cat}}")+ {:query+ (str "SELECT ID, NAME, CATEGORY_ID, LATITUDE, LONGITUDE, PRICE "+ "FROM VENUES "+ "WHERE CATEGORY_ID = {{cat}}")- :template_tags- {:cat {:name "cat" :display_name "cat" :type "number" :required true}}})+ :template_tags+ {:cat {:name "cat" :display_name "cat" :type "number" :required true}}}):remappings {:cat ["variable" ["template-tag" "cat"]]}}}:attributes {"cat" 50}}(is (=? (expected-cols)@@ -619,13 +619,13 @@(testing (str "If columns are removed/reordered we should still merge in metadata for the columns we're ""able to match from the original Table")(met/with-gtaps! {:gtaps {:venues {:query (mt/native-query- {:query- (str "SELECT NAME, ID, LONGITUDE, PRICE "- "FROM VENUES "- "WHERE CATEGORY_ID = {{cat}}")+ {:query+ (str "SELECT NAME, ID, LONGITUDE, PRICE "+ "FROM VENUES "+ "WHERE CATEGORY_ID = {{cat}}")- :template_tags- {:cat {:name "cat" :display_name "cat" :type "number" :required true}}})+ :template_tags+ {:cat {:name "cat" :display_name "cat" :type "number" :required true}}}):remappings {:cat ["variable" ["template-tag" "cat"]]}}}:attributes {"cat" 50}}(let [[id-col name-col _ _ longitude-col price-col] (expected-cols)]@@ -636,15 +636,15 @@(testing "Should be able to use a Saved Question with no source Metadata as a GTAP (EE #525)"(met/with-gtaps! (mt/$ids{:gtaps {:venues {:query (mt/native-query- {:query (str "SELECT DISTINCT VENUES.* "- "FROM VENUES "- "LEFT JOIN CHECKINS"- " ON CHECKINS.VENUE_ID = VENUES.ID "- "WHERE CHECKINS.USER_ID IN ({{sandbox}})")- :template-tags {"sandbox"- {:name "sandbox"- :display-name "Sandbox"- :type :text}}})+ {:query (str "SELECT DISTINCT VENUES.* "+ "FROM VENUES "+ "LEFT JOIN CHECKINS"+ " ON CHECKINS.VENUE_ID = VENUES.ID "+ "WHERE CHECKINS.USER_ID IN ({{sandbox}})")+ :template-tags {"sandbox"+ {:name "sandbox"+ :display-name "Sandbox"+ :type :text}}}):remappings {"user_id" [:variable [:template-tag "sandbox"]]}}:checkins {:remappings {"user_id" [:dimension $checkins.user_id]}}}:attributes {"user_id" 1}})@@ -667,13 +667,13 @@(testing "Should work with SQL queries that return less columns than there were in the original Table\n"(met/with-gtaps! (mt/$ids{:gtaps {:venues {:query (mt/native-query- {:query (str "SELECT * "- "FROM VENUES "- "WHERE VENUES.ID IN ({{sandbox}})")- :template-tags {"sandbox"- {:name "sandbox"- :display-name "Sandbox"- :type :text}}})+ {:query (str "SELECT * "+ "FROM VENUES "+ "WHERE VENUES.ID IN ({{sandbox}})")+ :template-tags {"sandbox"+ {:name "sandbox"+ :display-name "Sandbox"+ :type :text}}}):remappings {"venue_id" [:variable [:template-tag "sandbox"]]}}:checkins {}}:attributes {"venue_id" 1}})@@ -709,11 +709,11 @@(defn- do-with-sql-gtap! [sql f](met/with-gtaps! (mt/$ids{:gtaps {:venues {:query (mt/native-query- {:query sql- :template-tags {"sandbox"- {:name "sandbox"- :display-name "Sandbox"- :type :text}}})+ {:query sql+ :template-tags {"sandbox"+ {:name "sandbox"+ :display-name "Sandbox"+ :type :text}}}):remappings {"venue_id" [:variable [:template-tag "sandbox"]]}}:checkins {}}:attributes {"venue_id" 1}})@@ -1041,18 +1041,18 @@(pr-str orders-gtap-card-has-metadata?)(pr-str products-gtap-card-has-metadata?))(met/with-gtaps! {:gtaps {:orders {:query (mt/native-query- {:query "SELECT * FROM ORDERS WHERE USER_ID={{uid}} AND TOTAL > 10"- :template-tags {"uid" {:display-name "User ID"- :id "1"- :name "uid"- :type :number}}})+ {:query "SELECT * FROM ORDERS WHERE USER_ID={{uid}} AND TOTAL > 10"+ :template-tags {"uid" {:display-name "User ID"+ :id "1"+ :name "uid"+ :type :number}}}):remappings {"user_id" [:variable [:template-tag "uid"]]}}:products {:query (mt/native-query- {:query "SELECT * FROM PRODUCTS WHERE CATEGORY={{cat}} AND PRICE > 10"- :template-tags {"cat" {:display-name "Category"- :id "2"- :name "cat"- :type :text}}})+ {:query "SELECT * FROM PRODUCTS WHERE CATEGORY={{cat}} AND PRICE > 10"+ :template-tags {"cat" {:display-name "Category"+ :id "2"+ :name "cat"+ :type :text}}}):remappings {"user_cat" [:variable [:template-tag "cat"]]}}}:attributes {"user_id" "1", "user_cat" "Widget"}}(when orders-gtap-card-has-metadata?diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.cljindex 9e58e0a7e06..54497f8d7a5 100644--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj@@ -702,14 +702,14 @@:collection_id coll2-id:dataset_query(mt/native-query- {:query "select {{snippet}}"- :template-tags {"snippet"- {:display-name "Snippet 1",- :id s1-eid,- :name "snippet 1",- :snippet-id s1-id,- :snippet-name "snip",- :type "snippet"}}})}]+ {:query "select {{snippet}}"+ :template-tags {"snippet"+ {:display-name "Snippet 1",+ :id s1-eid,+ :name "snippet 1",+ :snippet-id s1-id,+ :snippet-name "snip",+ :type "snippet"}}})}](testing "native query snippets"(testing "can belong to :snippets collections"(let [ser (serdes/extract-one "NativeQuerySnippet" {} (t2/select-one :model/NativeQuerySnippet :id s1-id))]diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/params_test.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/params_test.cljindex 459a8ef4692..022e27e622b 100644--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/params_test.clj+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/params_test.clj@@ -46,8 +46,8 @@(testing (format "^%s %s" (some-> v class .getCanonicalName) (pr-str v))(let [results (qp/process-query(assoc (mt/native-query- {:query "SELECT ?"- :params [v]})+ {:query "SELECT ?"+ :params [v]}):middleware {:format-rows? false}))](is (= (or (:v expected) v)(first (mt/first-row results))))diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.cljindex fa43b510918..56730c1037d 100644--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj@@ -51,11 +51,11 @@(mt/rows(qp/process-query(mt/native-query- {:query (with-test-db-name- (str "SELECT `v4_test_data.venues`.`id` "- "FROM `v4_test_data.venues` "- "ORDER BY `v4_test_data.venues`.`id` DESC "- "LIMIT 2;"))})))))))+ {:query (with-test-db-name+ (str "SELECT `v4_test_data.venues`.`id` "+ "FROM `v4_test_data.venues` "+ "ORDER BY `v4_test_data.venues`.`id` DESC "+ "LIMIT 2;"))})))))))(deftest ^:parallel native-query-test-2(mt/test-driver :bigquery-cloud-sdk@@ -303,11 +303,11 @@(mt/rows(qp/process-query(mt/native-query- {:query (with-test-db-name- (str "SELECT `v4_test_data.venues`.`name` AS `name` "- "FROM `v4_test_data.venues` "- "WHERE `v4_test_data.venues`.`name` = ?"))- :params ["Red Medicine"]}))))))))+ {:query (with-test-db-name+ (str "SELECT `v4_test_data.venues`.`name` AS `name` "+ "FROM `v4_test_data.venues` "+ "WHERE `v4_test_data.venues`.`name` = ?"))+ :params ["Red Medicine"]}))))))))(deftest ^:parallel temporal-type-test(testing "Make sure we can detect temporal types correctly"@@ -987,11 +987,11 @@[int](qp/process-query(mt/native-query- {:query (with-test-db-name- (str "SELECT count(*) AS `count` "- "FROM `v4_test_data.venues` "- "WHERE `v4_test_data.venues`.`name` = ?"))- :params ["x\\\\' OR 1 = 1 -- "]})))))))))+ {:query (with-test-db-name+ (str "SELECT count(*) AS `count` "+ "FROM `v4_test_data.venues` "+ "WHERE `v4_test_data.venues`.`name` = ?"))+ :params ["x\\\\' OR 1 = 1 -- "]})))))))))(deftest ^:parallel escape-alias-test(testing "`escape-alias` should generate valid field identifiers"diff --git a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.cljindex c35f1a0a276..7166c2adce0 100644--- a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj+++ b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj@@ -276,7 +276,7 @@(mt/rows(qp/process-query(mt/native-query- {:query "-- foo+ {:query "-- foo/* comment */select 1;"}))))))))@@ -287,7 +287,7 @@(mt/rows(qp/process-query(mt/native-query- {:query "select * from ( with x as ( select 9 ) select * from x ) as y;"}))))))))+ {:query "select * from ( with x as ( select 9 ) select * from x ) as y;"}))))))))(deftest ^:parallel casted-params-test(mt/test-driver :clickhousediff --git a/modules/drivers/oracle/test/metabase/driver/oracle_test.clj b/modules/drivers/oracle/test/metabase/driver/oracle_test.cljindex 5a15e88c9c7..43bfe4831c9 100644--- a/modules/drivers/oracle/test/metabase/driver/oracle_test.clj+++ b/modules/drivers/oracle/test/metabase/driver/oracle_test.clj@@ -582,15 +582,15 @@date-cols-with-datetime-values(doseq [widget-type [:date/single :date/all-options]](let [query (mt/native-query- {:query "SELECT *+ {:query "SELECT *FROM \"mb_test\".\"date_cols_with_datetime_values_dates_with_time\"WHERE {{date_filter}}"- :template-tags {"date_filter"- {:name "date_filter"- :display-name "Date Filter"- :type :dimension- :dimension [:field (mt/id :date_cols_with_datetime_values_dates_with_time :date_with_time) nil]- :widget-type widget-type}}})+ :template-tags {"date_filter"+ {:name "date_filter"+ :display-name "Date Filter"+ :type :dimension+ :dimension [:field (mt/id :date_cols_with_datetime_values_dates_with_time :date_with_time) nil]+ :widget-type widget-type}}})query-with-params (assoc query :parameters [{:type widget-type:target [:dimension [:template-tag "date_filter"]]:value "2024-11-06"}])]@@ -634,15 +634,15 @@(mt/datasetdate-cols-with-datetime-values(let [query (mt/native-query- {:query "SELECT * FROM \"mb_test\".\"date_cols_with_datetime_values_dates_with_time\" WHERE {{date_filter}}"- :template-tags- {"date_filter"- {:name "date_filter"- :display-name "Date Filter"- :type :dimension- :widget-type :date/relative- :dimension [:field (mt/id- :date_cols_with_datetime_values_dates_with_time :date_with_time) nil]}}})]+ {:query "SELECT * FROM \"mb_test\".\"date_cols_with_datetime_values_dates_with_time\" WHERE {{date_filter}}"+ :template-tags+ {"date_filter"+ {:name "date_filter"+ :display-name "Date Filter"+ :type :dimension+ :widget-type :date/relative+ :dimension [:field (mt/id+ :date_cols_with_datetime_values_dates_with_time :date_with_time) nil]}}})](doseq [value ["past30days" "past3hours"]:let [query-with-params (assoc query :parameters [{:type :date/relative:value valuediff --git a/test/metabase/actions/actions_test.clj b/test/metabase/actions/actions_test.cljindex a2e8f355e8e..24ee6c7a5a2 100644--- a/test/metabase/actions/actions_test.clj+++ b/test/metabase/actions/actions_test.clj@@ -647,11 +647,11 @@"None of the errors are from ssh")))))(testing "Can perform custom actions on ssh-enabled database"(let [query (update (mt/native-query- {:query "update categories set name = 'foo' where id = {{id}}"- :template-tags {:id {:id "id"- :name "id"- :type "number"- :display-name "Id"}}})+ {:query "update categories set name = 'foo' where id = {{id}}"+ :template-tags {:id {:id "id"+ :name "id"+ :type "number"+ :display-name "Id"}}}):type name)](mt/with-actions [{card-id :id} {:type :model:dataset_query (mt/mbql-query categories)}diff --git a/test/metabase/dashboards/api_test.clj b/test/metabase/dashboards/api_test.cljindex e53392ef641..5185cfcef3d 100644--- a/test/metabase/dashboards/api_test.clj+++ b/test/metabase/dashboards/api_test.clj@@ -714,7 +714,7 @@[:model/Card {card-id :id} {:name "Native card":database_id (mt/id):dataset_query (mt/native-query- {:query "SELECT category FROM products LIMIT 10;"})+ {:query "SELECT category FROM products LIMIT 10;"}):type :model}:model/Dashboard {dash-id :id} {:parameters [{:name "Text":slug "text"@@ -3158,7 +3158,7 @@(mt/with-temp [:model/Card {model-id :id :as native-card} {:database_id (mt/id):name "Native Query":dataset_query (mt/native-query- {:query "SELECT category FROM products LIMIT 10;"})+ {:query "SELECT category FROM products LIMIT 10;"}):type :model}](let [metadata (-> (:dataset_query native-card)qp/process-query :data :results_metadata :columns)]@@ -3975,10 +3975,10 @@{:type :query:parameters [{:id field-name :slug field-name :target ["variable" ["template-tag" field-name]] :type :text}]:dataset_query (mt/native-query- {:query (format "insert into types (%s) values ({{%s}})"- (u/upper-case-en field-name)- field-name)- :template-tags {field-name {:id field-name :name field-name :type :text :display_name field-name}}})})+ {:query (format "insert into types (%s) values ({{%s}})"+ (u/upper-case-en field-name)+ field-name)+ :template-tags {field-name {:id field-name :name field-name :type :text :display_name field-name}}})})(deftest dashcard-action-execution-type-test(mt/test-drivers (disj (mt/normal-drivers-with-feature :actions) :mysql)@@ -4921,8 +4921,8 @@(mt/dataset test-data(mt/with-temp [:model/Dashboard {dashboard-id :id} {:last_viewed_at #t "2000-01-01"}:model/Card {card-id :id} {:dataset_query (mt/native-query- {:query "SELECT COUNT(*) FROM \"ORDERS\""- :template-tags {}})}+ {:query "SELECT COUNT(*) FROM \"ORDERS\""+ :template-tags {}})}:model/DashboardCard {dashcard-id :id} {:card_id card-id:dashboard_id dashboard-id}](let [original-last-viewed-at (t2/select-one-fn :last_viewed_at :model/Dashboard dashboard-id)]diff --git a/test/metabase/driver/common/parameters/values_test.clj b/test/metabase/driver/common/parameters/values_test.cljindex 508d8debdb7..043e2236972 100644--- a/test/metabase/driver/common/parameters/values_test.clj+++ b/test/metabase/driver/common/parameters/values_test.clj@@ -489,11 +489,11 @@{:order-by [[:asc $id]] :limit 2})}:model/Card card-2 {:collection_id (u/the-id collection):dataset_query (mt/native-query- {:query "SELECT * FROM {{card}}"- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-1-id}}})}]+ {:query "SELECT * FROM {{card}}"+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-1-id}}})}](perms/grant-collection-read-permissions! (perms-group/all-users) collection)(mt/with-test-user :rasta(binding [qp.perms/*card-id* (u/the-id card-2)]@@ -842,11 +842,11 @@:dataset_query (mt/mbql-query venues {:limit 2})}:model/Card {card-2-id :id} {:collection_id nil:dataset_query (mt/native-query- {:query "SELECT * FROM {{card}}"- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-1-id}}})}]+ {:query "SELECT * FROM {{card}}"+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-1-id}}})}];; even tho Card 2 references Card 1, we don't want to include it in the set of referenced Card IDs, since you;; should only need permissions for Card 2 to be able to run the query (see #15131)(testing (format "Card 1 ID = %d, Card 2 ID = %d" card-1-id card-2-id)diff --git a/test/metabase/driver/mysql_test.clj b/test/metabase/driver/mysql_test.cljindex 0f5ecb14313..fc5d54a756a 100644--- a/test/metabase/driver/mysql_test.clj+++ b/test/metabase/driver/mysql_test.clj@@ -313,7 +313,7 @@(mt/first-row(qp/process-query(assoc (mt/native-query- {:query (format "SELECT timediff(current_timestamp + INTERVAL %s, current_timestamp)" interval)})+ {:query (format "SELECT timediff(current_timestamp + INTERVAL %s, current_timestamp)" interval)});; disable the middleware that normally converts `LocalTime` to `Strings` so we can verify;; our driver is actually doing the right thing:middleware {:format-rows? false})))))))))))diff --git a/test/metabase/driver/postgres_test.clj b/test/metabase/driver/postgres_test.cljindex 812949b2853..95aa1112504 100644--- a/test/metabase/driver/postgres_test.clj+++ b/test/metabase/driver/postgres_test.clj@@ -628,13 +628,13 @@(mt/rows(qp/process-query(assoc (mt/native-query- {:query "SELECT * FROM users WHERE {{user}}"- :template-tags {:user- {:name "user"- :display_name "User ID"- :type "dimension"- :widget-type "number"- :dimension [:field (mt/id :users :user_id) nil]}}})+ {:query "SELECT * FROM users WHERE {{user}}"+ :template-tags {:user+ {:name "user"+ :display_name "User ID"+ :type "dimension"+ :widget-type "number"+ :dimension [:field (mt/id :users :user_id) nil]}}}):parameters[{:type "text":target ["dimension" ["template-tag" "user"]]@@ -645,13 +645,13 @@(mt/rows(qp/process-query(assoc (mt/native-query- {:query "SELECT * FROM users WHERE {{user}}"- :template-tags {:user- {:name "user"- :display_name "User ID"- :type "dimension"- :widget-type :number- :dimension [:field (mt/id :users :user_id) nil]}}})+ {:query "SELECT * FROM users WHERE {{user}}"+ :template-tags {:user+ {:name "user"+ :display_name "User ID"+ :type "dimension"+ :widget-type :number+ :dimension [:field (mt/id :users :user_id) nil]}}}):parameters[{:type "text":target ["dimension" ["template-tag" "user"]]diff --git a/test/metabase/embedding/api/embed_test.clj b/test/metabase/embedding/api/embed_test.cljindex c71f2788e51..758940fb3ea 100644--- a/test/metabase/embedding/api/embed_test.clj+++ b/test/metabase/embedding/api/embed_test.clj@@ -1470,15 +1470,15 @@(mt/dataset test-data(with-embedding-enabled-and-new-secret-key!(mt/with-temp [:model/Card {card-id :id, :as card} {:dataset_query (mt/native-query- {:query "SELECT count(*) AS count FROM PUBLIC.PEOPLE WHERE true [[AND {{NAME}}]]"- :template-tags {"NAME"- {:id "9ddca4ca-3906-83fd-bc6b-8480ae9ab05e"- :name "NAME"- :display-name "Name"- :type :dimension- :dimension [:field (mt/id :people :name) nil]- :widget-type :string/=- :default nil}}})+ {:query "SELECT count(*) AS count FROM PUBLIC.PEOPLE WHERE true [[AND {{NAME}}]]"+ :template-tags {"NAME"+ {:id "9ddca4ca-3906-83fd-bc6b-8480ae9ab05e"+ :name "NAME"+ :display-name "Name"+ :type :dimension+ :dimension [:field (mt/id :people :name) nil]+ :widget-type :string/=+ :default nil}}}):enable_embedding true:embedding_params {:NAME "enabled"}}](testing "Card"@@ -1508,10 +1508,10 @@(mt/dataset test-data(with-embedding-enabled-and-new-secret-key!(mt/with-temp [:model/Card card {:dataset_query (mt/native-query- {:query "SELECT count(*) FROM orders WHERE quantity = {{qty_locked}}"- :template-tags {"qty_locked" {:name "qty_locked"- :display-name "Quantity (Locked)"- :type :number}}})+ {:query "SELECT count(*) FROM orders WHERE quantity = {{qty_locked}}"+ :template-tags {"qty_locked" {:name "qty_locked"+ :display-name "Quantity (Locked)"+ :type :number}}}):enable_embedding true:embedding_params {:qty_locked "locked"}}](is (= [3443]@@ -1522,7 +1522,7 @@(mt/dataset test-data(with-embedding-enabled-and-new-secret-key!(mt/with-temp [:model/Card source-card {:dataset_query (mt/native-query- {:query "SELECT CAST('9223372036854775808' AS DECIMAL) as NUMBER UNION ALL+ {:query "SELECT CAST('9223372036854775808' AS DECIMAL) as NUMBER UNION ALLSELECT CAST('0' AS DECIMAL) as NUMBER UNION ALLSELECT CAST('-9223372036854775809' as DECIMAL) as NUMBER"})}:model/Card target-card {:dataset_query {:database (mt/id)diff --git a/test/metabase/embedding/api/preview_embed_test.clj b/test/metabase/embedding/api/preview_embed_test.cljindex f066087a847..b3e053f734b 100644--- a/test/metabase/embedding/api/preview_embed_test.clj+++ b/test/metabase/embedding/api/preview_embed_test.clj@@ -488,15 +488,15 @@(mt/dataset test-data(embed-test/with-embedding-enabled-and-new-secret-key!(mt/with-temp [:model/Card {card-id :id, :as card} {:dataset_query (mt/native-query- {:query "SELECT count(*) AS count FROM PUBLIC.PEOPLE WHERE true [[AND {{NAME}}]]"- :template-tags {"NAME"- {:name "NAME"- :display-name "Name"- :id "_name_"- :type :dimension- :dimension [:field (mt/id :people :name) nil]- :widget-type :string/=- :default nil}}})+ {:query "SELECT count(*) AS count FROM PUBLIC.PEOPLE WHERE true [[AND {{NAME}}]]"+ :template-tags {"NAME"+ {:name "NAME"+ :display-name "Name"+ :id "_name_"+ :type :dimension+ :dimension [:field (mt/id :people :name) nil]+ :widget-type :string/=+ :default nil}}}):enable_embedding true:embedding_params {"NAME" "enabled"}}](testing "Card"diff --git a/test/metabase/indexed_entities/models/model_index_test.clj b/test/metabase/indexed_entities/models/model_index_test.cljindex 0373e63ffea..78909ad758b 100644--- a/test/metabase/indexed_entities/models/model_index_test.clj+++ b/test/metabase/indexed_entities/models/model_index_test.clj@@ -187,8 +187,8 @@[:concat $title "custom"]}})[[[:expression "inc-id"] [:expression "full-name"]]]][:native (mt/native-query- (qp.compile/compile- (mt/mbql-query products {:fields [$id $title]})))]+ (qp.compile/compile+ (mt/mbql-query products {:fields [$id $title]})))](when (driver.u/supports? (:engine (mt/db)) :left-join (mt/db))[:join (mt/mbql-query people{:joins [{:fields :all,diff --git a/test/metabase/pulse/dashboard_subscription_test.clj b/test/metabase/pulse/dashboard_subscription_test.cljindex 939f70054d9..bab2273b4b1 100644--- a/test/metabase/pulse/dashboard_subscription_test.clj+++ b/test/metabase/pulse/dashboard_subscription_test.clj@@ -726,21 +726,21 @@(testing "SQL Query"(mt/with-temp [:model/Card {sql-card-id :id} {:name "Products (SQL)":dataset_query (mt/native-query- {:query- (str "SELECT id, title, category\n"- "FROM products\n"- "WHERE {{category}}\n"- "ORDER BY id ASC\n"- "LIMIT 2")-- :template-tags- {"category"- {:id "_SQL_CATEGORY_TEMPLATE_TAG_"- :name "category"- :display-name "Category"- :type :dimension- :dimension [:field (mt/id :products :category) nil]- :widget-type :category}}})}+ {:query+ (str "SELECT id, title, category\n"+ "FROM products\n"+ "WHERE {{category}}\n"+ "ORDER BY id ASC\n"+ "LIMIT 2")++ :template-tags+ {"category"+ {:id "_SQL_CATEGORY_TEMPLATE_TAG_"+ :name "category"+ :display-name "Category"+ :type :dimension+ :dimension [:field (mt/id :products :category) nil]+ :widget-type :category}}})}:model/DashboardCard _ {:parameter_mappings [{:parameter_id "_SQL_CATEGORY_":card_id sql-card-id:target [:dimension [:template-tag "category"]]}]@@ -773,7 +773,7 @@(mt/with-temp [:model/Dashboard {dashboard-id :id, :as dashboard} {:name "Dashboard"}:model/Card {card-id :id} {:name "Products (SQL)":dataset_query (mt/native-query- {:query "SELECT * FROM venues LIMIT 1"})}+ {:query "SELECT * FROM venues LIMIT 1"})}:model/DashboardCard _ {:dashboard_id dashboard-id:card_id card-id}](data-perms/set-database-permission! (perms-group/all-users) (mt/id) :perms/create-queries :no)diff --git a/test/metabase/query_processor/dashboard_test.clj b/test/metabase/query_processor/dashboard_test.cljindex 3a91ce9bf06..3df931a9c47 100644--- a/test/metabase/query_processor/dashboard_test.clj+++ b/test/metabase/query_processor/dashboard_test.clj@@ -456,8 +456,8 @@(mt/dataset test-data(mt/with-temp [:model/Dashboard {dashboard-id :id} {:last_viewed_at #t "2000-01-01"}:model/Card {card-id :id} {:dataset_query (mt/native-query- {:query "SELECT COUNT(*) FROM \"ORDERS\""- :template-tags {}})}+ {:query "SELECT COUNT(*) FROM \"ORDERS\""+ :template-tags {}})}:model/DashboardCard {dashcard-id :id} {:card_id card-id:dashboard_id dashboard-id}](let [original-last-viewed-at (t2/select-one-fn :last_viewed_at :model/Dashboard dashboard-id)]diff --git a/test/metabase/query_processor/middleware/parameters/native_test.clj b/test/metabase/query_processor/middleware/parameters/native_test.cljindex ac5d7adab45..290618efa7a 100644--- a/test/metabase/query_processor/middleware/parameters/native_test.clj+++ b/test/metabase/query_processor/middleware/parameters/native_test.clj@@ -49,11 +49,11 @@{:id 2:collection-id nil:dataset-query (mt/native-query- {:query (mt/native-query-with-card-template-tag driver/*driver* "card")- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id 1}}})}]})+ {:query (mt/native-query-with-card-template-tag driver/*driver* "card")+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id 1}}})}]})query (lib/querymp(mt/native-query {:query (mt/native-query-with-card-template-tag driver/*driver* "card")diff --git a/test/metabase/query_processor/middleware/parameters_test.clj b/test/metabase/query_processor/middleware/parameters_test.cljindex a6bc62f4b91..f34ac1c4cab 100644--- a/test/metabase/query_processor/middleware/parameters_test.clj+++ b/test/metabase/query_processor/middleware/parameters_test.clj@@ -317,12 +317,12 @@:name "Filter: expensive venues"}]:cards [{:id 1:dataset-query (mt/native-query- {:query (str "SELECT {{ Venue fields }} "- "FROM venues "- "WHERE {{ Filter: expensive venues }}")- :template-tags (snippet-template-tags- {"Venue fields" 1- "Filter: expensive venues" 2})})}]})]+ {:query (str "SELECT {{ Venue fields }} "+ "FROM venues "+ "WHERE {{ Filter: expensive venues }}")+ :template-tags (snippet-template-tags+ {"Venue fields" 1+ "Filter: expensive venues" 2})})}]})](testing "multiple snippets are correctly expanded in parent query"(is (=? {:native {:query "SELECT name, price FROM venues WHERE price > 2", :params nil}}(substitute-params mp (:dataset-query (lib.metadata/card mp 1))))))@@ -331,8 +331,8 @@(substitute-paramsmp(mt/native-query- {:query "SELECT * FROM {{#1}} AS x"- :template-tags (card-template-tags [1])})))))))+ {:query "SELECT * FROM {{#1}} AS x"+ :template-tags (card-template-tags [1])})))))))(deftest ^:parallel include-card-parameters-test(testing "Expanding a Card reference should include its parameters (#12236)"diff --git a/test/metabase/query_processor/middleware/permissions_test.clj b/test/metabase/query_processor/middleware/permissions_test.cljindex ba8fc22cb94..e10213af1f3 100644--- a/test/metabase/query_processor/middleware/permissions_test.clj+++ b/test/metabase/query_processor/middleware/permissions_test.clj@@ -358,11 +358,11 @@(mt/with-temp [:model/Card {card-1-id :id, :as card-1} {:collection_id (u/the-id collection):dataset_query card-1-query}](let [card-2-query (mt/native-query- {:query "SELECT * FROM {{card}}"- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-1-id}}})]+ {:query "SELECT * FROM {{card}}"+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-1-id}}})](mt/with-temp [:model/Card card-2 {:collection_id (u/the-id collection):dataset_query card-2-query}](testing "should be able to read nested-nested Card if we have Collection permissions"@@ -406,10 +406,10 @@(mt/with-temp [:model/Collection collection](perms/grant-collection-read-permissions! (perms/all-users-group) collection)(let [card-1-query (mt/native-query- {:query (str "SELECT id, name, category_id, latitude, longitude, price "- "FROM venues "- "ORDER BY id ASC "- "LIMIT 2")})]+ {:query (str "SELECT id, name, category_id, latitude, longitude, price "+ "FROM venues "+ "ORDER BY id ASC "+ "LIMIT 2")})](mt/with-temp [:model/Card {card-1-id :id, :as card-1} {:collection_id (u/the-id collection):dataset_query card-1-query}](let [card-2-query (mt/mbql-query nil@@ -457,18 +457,18 @@(mt/with-temp [:model/Collection collection](perms/grant-collection-read-permissions! (perms/all-users-group) collection)(let [card-1-query (mt/native-query- {:query (str "SELECT id, name, category_id, latitude, longitude, price "- "FROM venues "- "ORDER BY id ASC "- "LIMIT 2")})]+ {:query (str "SELECT id, name, category_id, latitude, longitude, price "+ "FROM venues "+ "ORDER BY id ASC "+ "LIMIT 2")})](mt/with-temp [:model/Card {card-1-id :id, :as card-1} {:collection_id (u/the-id collection):dataset_query card-1-query}](let [card-2-query (mt/native-query- {:query "SELECT * FROM {{card}}"- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-1-id}}})]+ {:query "SELECT * FROM {{card}}"+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-1-id}}})](mt/with-temp [:model/Card card-2 {:collection_id (u/the-id collection):dataset_query card-2-query}](testing "should be able to read nested-nested Card if we have Collection permissions"@@ -571,11 +571,11 @@(mt/with-temp [:model/Card {card-1-id :id, :as card-1} {:collection_id collection-1-id:dataset_query card-1-query}](let [card-2-query (mt/native-query- {:query "SELECT * FROM {{card}}"- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-1-id}}})]+ {:query "SELECT * FROM {{card}}"+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-1-id}}})](mt/with-temp [:model/Card card-2 {:collection_id collection-2-id:dataset_query card-2-query}](mt/with-test-user :rasta@@ -624,10 +624,10 @@;; Grant read permissions for Collection 2 but not Collection 1(perms/grant-collection-read-permissions! (perms/all-users-group) collection-2-id)(let [card-1-query (mt/native-query- {:query (str "SELECT id, name, category_id, latitude, longitude, price "- "FROM venues "- "ORDER BY id ASC "- "LIMIT 2")})]+ {:query (str "SELECT id, name, category_id, latitude, longitude, price "+ "FROM venues "+ "ORDER BY id ASC "+ "LIMIT 2")})](mt/with-temp [:model/Card {card-1-id :id, :as card-1} {:collection_id collection-1-id:dataset_query card-1-query}](let [card-2-query (mt/mbql-query nil@@ -680,18 +680,18 @@;; Grant read permissions for Collection 2 but not Collection 1(perms/grant-collection-read-permissions! (perms/all-users-group) collection-2-id)(let [card-1-query (mt/native-query- {:query (str "SELECT id, name, category_id, latitude, longitude, price "- "FROM venues "- "ORDER BY id ASC "- "LIMIT 2")})]+ {:query (str "SELECT id, name, category_id, latitude, longitude, price "+ "FROM venues "+ "ORDER BY id ASC "+ "LIMIT 2")})](mt/with-temp [:model/Card {card-1-id :id, :as card-1} {:collection_id collection-1-id:dataset_query card-1-query}](let [card-2-query (mt/native-query- {:query "SELECT * FROM {{card}}"- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-1-id}}})]+ {:query "SELECT * FROM {{card}}"+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-1-id}}})](mt/with-temp [:model/Card card-2 {:collection_id collection-2-id:dataset_query card-2-query}](mt/with-test-user :rasta@@ -1541,11 +1541,11 @@;; Card 1: Native query in accessible collection(let [card-1-query (mt/native-query- {:query (str "SELECT id, name, category_id, price "- "FROM venues "- "WHERE price > 1 "- "ORDER BY id ASC "- "LIMIT 2")})]+ {:query (str "SELECT id, name, category_id, price "+ "FROM venues "+ "WHERE price > 1 "+ "ORDER BY id ASC "+ "LIMIT 2")})](mt/with-temp [:model/Card {card-1-id :id} {:collection_id coll-1:dataset_query card-1-query}];; Card 2: MBQL query in restricted collection@@ -1556,11 +1556,11 @@:dataset_query card-2-query}];; Card 3: Native query with template tag in accessible collection(let [card-3-query (mt/native-query- {:query "SELECT * FROM {{card}} WHERE id = 1"- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-2-id}}})]+ {:query "SELECT * FROM {{card}} WHERE id = 1"+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-2-id}}})](mt/with-temp [:model/Card {card-3-id :id} {:collection_id coll-3:dataset_query card-3-query}](mt/with-test-user :rastadiff --git a/test/metabase/query_processor/parameters/temporal_units_test.clj b/test/metabase/query_processor/parameters/temporal_units_test.cljindex 23f8df7f3c6..2ddc5e1212c 100644--- a/test/metabase/query_processor/parameters/temporal_units_test.clj+++ b/test/metabase/query_processor/parameters/temporal_units_test.clj@@ -35,11 +35,11 @@(testing "temporal unit parameters"(let [base-query (mt/arbitrary-select-query driver/*driver* :orders "{{time-unit}}")native-query (mt/native-query- (assoc base-query- :template-tags {"time-unit" {:name "id"- :display-name "id"- :type :temporal-unit- :dimension [:field (mt/id :orders :created_at)]}}))+ (assoc base-query+ :template-tags {"time-unit" {:name "id"+ :display-name "id"+ :type :temporal-unit+ :dimension [:field (mt/id :orders :created_at)]}}))parameterized-query (assoc native-query:parameters [{:type :temporal-unit:name "time-unit"@@ -83,12 +83,12 @@(testing "temporal unit parameters"(let [base-query (mt/arbitrary-select-query driver/*driver* :orders "{{time-unit}}")native-query (mt/native-query- (assoc base-query- :template-tags {"time-unit" {:name "id"- :display-name "id"- :type :temporal-unit- :dimension [:field (mt/id :orders :created_at)]- :alias (mt/make-alias driver/*driver* "created_at")}}))+ (assoc base-query+ :template-tags {"time-unit" {:name "id"+ :display-name "id"+ :type :temporal-unit+ :dimension [:field (mt/id :orders :created_at)]+ :alias (mt/make-alias driver/*driver* "created_at")}}))parameterized-query (assoc native-query:parameters [{:type :temporal-unit:name "time-unit"@@ -132,11 +132,11 @@(testing "temporal unit parameters"(let [base-query (mt/arbitrary-select-query driver/*driver* :orders "{{time-unit}}")query (assoc (mt/native-query- (assoc base-query- :template-tags {"time-unit" {:name "id"- :display-name "id"- :type :temporal-unit- :dimension [:field 1000000000]}}))+ (assoc base-query+ :template-tags {"time-unit" {:name "id"+ :display-name "id"+ :type :temporal-unit+ :dimension [:field 1000000000]}})):parameters [{:type :temporal-unit:name "time-unit":target [:variable [:template-tag "time-unit"]]@@ -151,11 +151,11 @@(testing "temporal unit parameters"(let [base-query (mt/arbitrary-select-query driver/*driver* :orders "{{time-unit}}")query (assoc (mt/native-query- (assoc base-query- :template-tags {"time-unit" {:name "id"- :display-name "id"- :type :temporal-unit- :dimension [:field (mt/id :orders :created_at)]}}))+ (assoc base-query+ :template-tags {"time-unit" {:name "id"+ :display-name "id"+ :type :temporal-unit+ :dimension [:field (mt/id :orders :created_at)]}})):parameters [{:type :temporal-unit:name "time-unit":target [:dimension [:template-tag "time-unit"]]diff --git a/test/metabase/query_processor_test/alternative_date_test.clj b/test/metabase/query_processor_test/alternative_date_test.cljindex abc366328f6..264aefa301f 100644--- a/test/metabase/query_processor_test/alternative_date_test.clj+++ b/test/metabase/query_processor_test/alternative_date_test.clj@@ -169,16 +169,16 @@(testing "Make sure `:date/range` SQL field filters work correctly with UNIX timestamps (#11934)"(mt/dataset tupac-sightings(let [query (mt/native-query- (merge (mt/count-with-field-filter-query driver/*driver* :sightings :timestamp)- (mt/$ids sightings- {:template-tags {"timestamp" {:name "timestamp"- :display-name "Sighting Timestamp"- :type :dimension- :dimension $timestamp- :widget-type :date/range}}- :parameters [{:type :date/range- :target [:dimension [:template-tag "timestamp"]]- :value "2014-02-01~2015-02-29"}]})))]+ (merge (mt/count-with-field-filter-query driver/*driver* :sightings :timestamp)+ (mt/$ids sightings+ {:template-tags {"timestamp" {:name "timestamp"+ :display-name "Sighting Timestamp"+ :type :dimension+ :dimension $timestamp+ :widget-type :date/range}}+ :parameters [{:type :date/range+ :target [:dimension [:template-tag "timestamp"]]+ :value "2014-02-01~2015-02-29"}]})))](testing (format "\nquery = %s" (u/pprint-to-str query))(is (= [[41]](mt/formatted-rowsdiff --git a/test/metabase/query_processor_test/native_test.clj b/test/metabase/query_processor_test/native_test.cljindex 7d5157793e4..98476dc6503 100644--- a/test/metabase/query_processor_test/native_test.clj+++ b/test/metabase/query_processor_test/native_test.clj@@ -35,7 +35,7 @@(qp.test-util/rows-and-cols(qp/process-query(mt/native-query- {:query "select name from users;"}))))))+ {:query "select name from users;"}))))))(deftest ^:parallel native-with-duplicate-column-names(testing "Should be able to run native query referring a question referring a question (#25988)"diff --git a/test/metabase/query_processor_test/nested_queries_test.clj b/test/metabase/query_processor_test/nested_queries_test.cljindex a61a2acf9a1..03f0d9f8d4f 100644--- a/test/metabase/query_processor_test/nested_queries_test.clj+++ b/test/metabase/query_processor_test/nested_queries_test.clj@@ -1559,13 +1559,13 @@:breakout [!month.created_at]:limit 2})])(let [query (mt/native-query- {:query "SELECT * FROM {{#1}} x"- :template-tags {"#1"- {:id "5aa37572-058f-14f6-179d-a158ad6c029d"- :name "#1"- :display-name "#1"- :type :card- :card-id 1}}})]+ {:query "SELECT * FROM {{#1}} x"+ :template-tags {"#1"+ {:id "5aa37572-058f-14f6-179d-a158ad6c029d"+ :name "#1"+ :display-name "#1"+ :type :card+ :card-id 1}}})](is (= [["2016-04-01T00:00:00Z" 1]["2016-05-01T00:00:00Z" 5]](mt/formatted-rowsdiff --git a/test/metabase/query_processor_test/parameters_test.clj b/test/metabase/query_processor_test/parameters_test.cljindex 9363ad95993..8eab1d6f488 100644--- a/test/metabase/query_processor_test/parameters_test.clj+++ b/test/metabase/query_processor_test/parameters_test.clj@@ -48,11 +48,11 @@:parameters [{:type :text, :target [:variable [:template-tag \"name\"]], :value \"Tempest\"}]}"[table field param-type param-value {:keys [defaults?]}](let [query (mt/native-query- (assoc (mt/count-with-template-tag-query driver/*driver* table field param-type)- :template-tags {(name field) {:name (name field)- :display-name (name field)- :type (or (namespace param-type)- (name param-type))}}))]+ (assoc (mt/count-with-template-tag-query driver/*driver* table field param-type)+ :template-tags {(name field) {:name (name field)+ :display-name (name field)+ :type (or (namespace param-type)+ (name param-type))}}))](if defaults?(query-with-default-parameter-value query field param-value)(assoc query :parameters [{:type param-type@@ -521,12 +521,12 @@(testing "Legacy queries with parameters that don't specify `:widget-type` should still work (#20643)"(mt/dataset test-data(let [query (mt/native-query- {:query "SELECT count(*) FROM products WHERE {{cat}};"- :template-tags {"cat" {:id "__MY_CAT__"- :name "cat"- :display-name "Cat"- :type :dimension- :dimension [:field (mt/id :products :category) nil]}}})]+ {:query "SELECT count(*) FROM products WHERE {{cat}};"+ :template-tags {"cat" {:id "__MY_CAT__"+ :name "cat"+ :display-name "Cat"+ :type :dimension+ :dimension [:field (mt/id :products :category) nil]}}})](is (= [200](mt/first-row (qp/process-query query))))))))@@ -540,23 +540,23 @@query (lib/querymp(mt/native-query- {:query (str/join \newline- [(format "WITH exclude_products AS {{%s}}" param-name)- "SELECT count(*)"- "FROM orders"- "[[WHERE {{created_at}}]]"])- :template-tags {param-name {:type :card- :card-id 1- :display-name param-name- :id "__source__"- :name param-name}- "created_at" {:type :dimension- :default nil- :dimension [:field (mt/id :orders :created_at) nil]- :display-name "Created At"- :id "__created_at__"- :name "created_at"- :widget-type :date/all-options}}}))]+ {:query (str/join \newline+ [(format "WITH exclude_products AS {{%s}}" param-name)+ "SELECT count(*)"+ "FROM orders"+ "[[WHERE {{created_at}}]]"])+ :template-tags {param-name {:type :card+ :card-id 1+ :display-name param-name+ :id "__source__"+ :name param-name}+ "created_at" {:type :dimension+ :default nil+ :dimension [:field (mt/id :orders :created_at) nil]+ :display-name "Created At"+ :id "__created_at__"+ :name "created_at"+ :widget-type :date/all-options}}}))](testing "With no parameters"(mt/with-native-query-testing-context query(is (= [[18760]]@@ -671,11 +671,11 @@{card-2-id :id, :as card-2}{:collection_id collection-2-id:dataset_query (mt/native-query- {:query (mt/native-query-with-card-template-tag driver/*driver* "card")- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-1-id}}})}]+ {:query (mt/native-query-with-card-template-tag driver/*driver* "card")+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-1-id}}})}](testing (format "\nCollection 1 ID = %d, Card 1 ID = %d; Collection 2 ID = %d, Card 2 ID = %d"collection-1-id card-1-id collection-2-id card-2-id)(mt/with-test-user :rasta@@ -695,11 +695,11 @@:native (dissoc (qp.compile/compile (:dataset_query card-2)):query-permissions/referenced-card-ids)}))))))(let [query (mt/native-query- {:query (mt/native-query-with-card-template-tag driver/*driver* "card")- :template-tags {"card" {:name "card"- :display-name "card"- :type :card- :card-id card-2-id}}})]+ {:query (mt/native-query-with-card-template-tag driver/*driver* "card")+ :template-tags {"card" {:name "card"+ :display-name "card"+ :type :card+ :card-id card-2-id}}})](testing "SHOULD NOT be able to run native query with Card ID template tag"(is (thrown-with-msg?clojure.lang.ExceptionInfodiff --git a/test/metabase/query_processor_test/persistence_test.clj b/test/metabase/query_processor_test/persistence_test.cljindex 0dd1e57ed5f..4b70ac43f03 100644--- a/test/metabase/query_processor_test/persistence_test.clj+++ b/test/metabase/query_processor_test/persistence_test.clj@@ -110,8 +110,8 @@(mt/dataset test-data(doseq [[query-type query] [[:query (mt/mbql-query products)]#_[:native (mt/native-query- (qp.compile/compile- (mt/mbql-query products)))]]]+ (qp.compile/compile+ (mt/mbql-query products)))]]](mt/with-persistence-enabled! [persist-models!](mt/with-temp [:model/Card model {:type :model:database_id (mt/id)diff --git a/test/metabase/query_processor_test/uuid_test.clj b/test/metabase/query_processor_test/uuid_test.cljindex 390b269148b..732348fb8c7 100644--- a/test/metabase/query_processor_test/uuid_test.clj+++ b/test/metabase/query_processor_test/uuid_test.clj@@ -43,12 +43,12 @@(testing "uuid field filters"(mt/dataset uuid-dogs(let [query (assoc (mt/native-query- (assoc (mt/count-with-field-filter-query driver/*driver* :people :id "27e164bc-54f8-47a0-a85a-9f0e90dd7667")- :template-tags {"id" {:name "id"- :display-name "id"- :type :dimension- :widget-type :id- :dimension [:field (mt/id :people :id) nil]}}))+ (assoc (mt/count-with-field-filter-query driver/*driver* :people :id "27e164bc-54f8-47a0-a85a-9f0e90dd7667")+ :template-tags {"id" {:name "id"+ :display-name "id"+ :type :dimension+ :widget-type :id+ :dimension [:field (mt/id :people :id) nil]}})):parameters [{:type :id:name "id":target [:dimension [:template-tag "id"]]