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
Take existing tables into account when determining already-loaded bigquery (#76936)
technomancye0ad46723646
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.cljindex 70f9cdb9b73..f1a0086fc56 100644--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj@@ -1,9 +1,9 @@(ns metabase.test.data.bigquery-cloud-sdk(:require+ [clojure.set :as set][clojure.string :as str][java-time.api :as t][medley.core :as m]- [metabase.config.core :as config][metabase.driver :as driver][metabase.driver.bigquery-cloud-sdk :as bigquery][metabase.driver.bigquery-cloud-sdk.workspaces :as bigquery.ws]@@ -67,8 +67,7 @@database-name;; releases get their own isolated datasets(tx/on-master-or-release-branch?)- (str "sha_" (config/current-major-version) "_"- (tx/hash-dataset db-def) "_" (normalize-name database-name))+ (str "sha_rel_" (tx/hash-dataset db-def) "_" (normalize-name database-name)):else(str "sha__" (tx/hash-dataset db-def) "_" (normalize-name database-name))))@@ -517,9 +516,16 @@[(test-dataset-id db-def)])ffirst))+(defn- get-existing-tables [dataset-id]+ (let [sql (format "SELECT table_name FROM %s.%s.INFORMATION_SCHEMA.TABLES"+ (project-id) dataset-id)]+ (set (map first (execute! sql)))))+(defmethod tx/dataset-already-loaded? :bigquery-cloud-sdk[_driver db-def]- (database-exists?! db-def))+ (and (database-exists?! db-def)+ (set/subset? (set (map :table-name (:table-definitions db-def)))+ (set (get-existing-tables (test-dataset-id db-def))))))(defmethod tx/track-dataset :bigquery-cloud-sdk[_driver db-def]@@ -535,11 +541,6 @@(test-dataset-id db-def)(tx/tracking-access-note)])))-(defn- get-existing-tables [dataset-id]- (let [sql (format "SELECT table_name FROM %s.%s.INFORMATION_SCHEMA.TABLES"- (project-id) dataset-id)]- (set (map first (execute! sql)))))-(defmethod tx/create-db! :bigquery-cloud-sdk[driver {:keys [database-name table-definitions options] :as db-def} & _]{:pre [(seq database-name) (sequential? table-definitions)]}diff --git a/modules/drivers/snowflake/test/metabase/test/data/snowflake.clj b/modules/drivers/snowflake/test/metabase/test/data/snowflake.cljindex b6b0cb9ef5b..47b7d09b823 100644--- a/modules/drivers/snowflake/test/metabase/test/data/snowflake.clj+++ b/modules/drivers/snowflake/test/metabase/test/data/snowflake.clj@@ -2,7 +2,6 @@(:require[clojure.java.jdbc :as jdbc][clojure.string :as str]- [metabase.config.core :as config][metabase.driver :as driver][metabase.driver.sql-jdbc.connection :as sql-jdbc.conn][metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]@@ -56,8 +55,7 @@database-name;; releases get their own isolated datasets(tx/on-master-or-release-branch?)- (str "sha_" (config/current-major-version) "_"- (tx/hash-dataset db-def) "_" database-name)+ (str "sha_rel_" (tx/hash-dataset db-def) "_" database-name):else(str "sha__" (tx/hash-dataset db-def) "_" database-name)))