Skip to content

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

Fix cloud implicit join tests (#68762)

William52f689cb36e0
diff --git a/modules/drivers/athena/test/metabase/driver/athena_test.clj b/modules/drivers/athena/test/metabase/driver/athena_test.clj
index d0e5f243386..3c2b67bae9f 100644
--- a/modules/drivers/athena/test/metabase/driver/athena_test.clj
+++ b/modules/drivers/athena/test/metabase/driver/athena_test.clj
@@ -57,7 +57,7 @@
{:name "latitude", :base-type :type/Float, :database-type "double", :database-position 3}
{:name "longitude", :base-type :type/Float, :database-type "double", :database-position 4}
{:name "price", :base-type :type/Integer, :database-type "int", :database-position 5}}
- (#'athena/describe-table-fields-with-nested-fields (mt/db) "test_data" "venues")))))
+ (#'athena/describe-table-fields-with-nested-fields (mt/db) "v3_test_data" "venues")))))
(deftest ^:parallel endpoint-test
(testing "AWS Endpoint URL"
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.clj
index dbaf2fa3e18..e5a694a3636 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
@@ -179,7 +179,13 @@
" COUNT(*) AS `count`"
"FROM"
" `v4_test_data.venues`"
- " LEFT JOIN `v4_test_data.categories` AS `categories__via__category_id` ON `v4_test_data.venues`.`category_id` = `categories__via__category_id`.`id`"
+ " LEFT JOIN ("
+ " SELECT"
+ " `v4_test_data.categories`.`id` AS `id`,"
+ " `v4_test_data.categories`.`name` AS `name`"
+ " FROM"
+ " `v4_test_data.categories`"
+ " ) AS `categories__via__category_id` ON `v4_test_data.venues`.`category_id` = `categories__via__category_id`.`id`"
"GROUP BY"
" `categories__via__category_id__name`"
"ORDER BY"
@@ -1047,7 +1053,17 @@
" `Organizacao__via__venue_id`.`name` AS `Organizacao__via__venue_id__name`"
"FROM"
" `v4_test_data.checkins`"
- " LEFT JOIN `v4_test_data.Organização` AS `Organizacao__via__venue_id` ON `v4_test_data.checkins`.`venue_id` = `Organizacao__via__venue_id`.`id`"
+ " LEFT JOIN ("
+ " SELECT"
+ " `v4_test_data.Organização`.`id` AS `id`,"
+ " `v4_test_data.Organização`.`name` AS `name`,"
+ " `v4_test_data.Organização`.`category_id` AS `category_id`,"
+ " `v4_test_data.Organização`.`latitude` AS `latitude`,"
+ " `v4_test_data.Organização`.`longitude` AS `longitude`,"
+ " `v4_test_data.Organização`.`price` AS `price`"
+ " FROM"
+ " `v4_test_data.Organização`"
+ " ) AS `Organizacao__via__venue_id` ON `v4_test_data.checkins`.`venue_id` = `Organizacao__via__venue_id`.`id`"
"LIMIT"
" 1"]
:params nil
diff --git a/test/metabase/query_processor/implicit_joins_test.clj b/test/metabase/query_processor/implicit_joins_test.clj
index d9a9477cdab..69a167f9efd 100644
--- a/test/metabase/query_processor/implicit_joins_test.clj
+++ b/test/metabase/query_processor/implicit_joins_test.clj
@@ -231,7 +231,7 @@
:aggregation [[:count]]
:limit 1})))))))))))
-(mt/defdataset long-col-name-dataset
+(mt/defdataset long-column-name-dataset
[["long_col_name" [{:field-name "fk"
:base-type :type/Integer}
{:field-name "abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_"
@@ -249,7 +249,7 @@
(deftest long-col-name-repro-test
(mt/test-drivers (mt/normal-drivers-with-feature :left-join)
- (mt/dataset long-col-name-dataset
+ (mt/dataset long-column-name-dataset
(let [mp (mt/metadata-provider)
table (lib.metadata/table mp (mt/id :long_col_name))
query (lib/query mp table)
diff --git a/test/metabase/test/data/interface.clj b/test/metabase/test/data/interface.clj
index bb79d45d055..6bc052498ed 100644
--- a/test/metabase/test/data/interface.clj
+++ b/test/metabase/test/data/interface.clj
@@ -1266,7 +1266,7 @@
(defmethod agg-venues-by-category-id :athena
[_driver]
"select category_id, array_agg(name)
- from test_data.venues
+ from v3_test_data.venues
group by category_id
order by 1 asc
limit 2;")