Skip to content

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

ensure type/* for base-type if otherwise not known (#63930)

dpsutton821c0f624bcd
diff --git a/src/metabase/driver/sql_jdbc/metadata.clj b/src/metabase/driver/sql_jdbc/metadata.clj
index a0c55312ed9..870f09126b4 100644
--- a/src/metabase/driver/sql_jdbc/metadata.clj
+++ b/src/metabase/driver/sql_jdbc/metadata.clj
@@ -34,5 +34,6 @@
{:lib/type :metadata/column
:name (.getColumnLabel rsmeta i)
:database-type database-type
- :base-type (sql-jdbc.sync.interface/database-type->base-type driver (keyword database-type))}))
+ :base-type (or (sql-jdbc.sync.interface/database-type->base-type driver (keyword database-type))
+ :type/*)}))
(range 1 (inc (.getColumnCount rsmeta))))))))))
diff --git a/src/metabase/legacy_mbql/normalize.cljc b/src/metabase/legacy_mbql/normalize.cljc
index d57fd4b0b80..e2d5addf8c3 100644
--- a/src/metabase/legacy_mbql/normalize.cljc
+++ b/src/metabase/legacy_mbql/normalize.cljc
@@ -411,13 +411,13 @@
u/->snake_case_en
u/->kebab-case-en) k)
v (case k
- (:base_type
- :effective_type
- :semantic_type
+ (:semantic_type
:visibility_type
:source
:unit
:lib/source) (keyword v)
+ (:effective_type
+ :base_type) (or (keyword v) :type/*)
:field_ref (normalize-field-ref v)
:fingerprint (normalize-fingerprint v)
:binning_info (m/update-existing v :binning_strategy keyword)
diff --git a/test/metabase/driver/postgres_test.clj b/test/metabase/driver/postgres_test.clj
index c1fa69ca4e3..812949b2853 100644
--- a/test/metabase/driver/postgres_test.clj
+++ b/test/metabase/driver/postgres_test.clj
@@ -42,6 +42,7 @@
[metabase.test.data.interface :as tx]
[metabase.util :as u]
[metabase.util.honey-sql-2 :as h2x]
+ [metabase.util.json :as json]
[metabase.util.log :as log]
[metabase.warehouses.provider-detection :as provider-detection]
[next.jdbc :as next.jdbc]
@@ -1824,6 +1825,58 @@
mt/process-query
mt/rows))))))
+(deftest ^:parallel arrays-have-base-type
+ (testing "queries with pg arrays have a base type on column metadata (#63909)"
+ (mt/test-driver :postgres
+ (is (=? [{:name "id"
+ :database_type "int4"
+ :base_type :type/Integer}
+ {:name "urls"
+ :database_type "_text"
+ :base_type :type/*}]
+ (->> (mt/native-query {:query "SELECT *
+ FROM (
+ VALUES
+ (1, ARRAY['https://example.com', 'https://example.org']),
+ (2, ARRAY['https://test.com']),
+ (3, ARRAY['https://foo.com', 'https://bar.com', 'https://baz.com'])
+ ) AS adhoc_table (id, urls);"})
+ mt/process-query
+ mt/cols))))))
+
+(deftest can-edit-model-metadata
+ (testing "queries with pg arrays have a base type on column metadata (#63909)"
+ (mt/test-driver :postgres
+ (let [query "SELECT *
+ FROM (
+ VALUES
+ (1, ARRAY['https://example.com', 'https://example.org']),
+ (2, ARRAY['https://test.com']),
+ (3, ARRAY['https://foo.com', 'https://bar.com', 'https://baz.com'])
+ ) AS adhoc_table (id, urls);"]
+ (mt/with-temp [:model/Card model (mt/card-with-metadata
+ {:name "model"
+ :type :model
+ :dataset_query (mt/native-query {:query query})
+ :database_id (mt/id)})]
+ ;; update cards such that base_type is missing, similuating existing data
+ (t2/query ["update report_card set result_metadata = ? where id = ?"
+ (json/encode [(first (:result_metadata model))
+ (assoc (second (:result_metadata model))
+ :base_type nil)])
+ (:id model)])
+ (let [response (mt/user-http-request :crowberto :put 200
+ (format "card/%d" (:id model))
+ {:dataset_query
+ (mt/native-query {:query (str "-- comment at top\n " query)})})]
+ (is (=? [{:name "id"
+ :database_type "int4"
+ :base_type "type/Integer"}
+ {:name "urls"
+ :database_type "_text"
+ :base_type "type/*"}]
+ (:result_metadata response)))))))))
+
(deftest ^:parallel detect-provider-from-database-test
(let [tests [["Aiven" "mydb-project.aivencloud.com"]
["Amazon RDS" "czrs8kj4isg7.us-east-1.rds.amazonaws.com"]