Skip to content

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

Fix flaky dataset-already-loaded?-test for Redshift (#68292)

bryan58e4025456d2
diff --git a/modules/drivers/redshift/test/metabase/test/data/redshift.clj b/modules/drivers/redshift/test/metabase/test/data/redshift.clj
index 99baafbd1a0..5bf276ea2c2 100644
--- a/modules/drivers/redshift/test/metabase/test/data/redshift.clj
+++ b/modules/drivers/redshift/test/metabase/test/data/redshift.clj
@@ -299,21 +299,15 @@
(let [session-schema (unique-session-schema)
tabledef (first (:table-definitions dbdef))
;; table-name should be something like test_data_venues
- table-name (tx/db-qualified-table-name (:database-name dbdef) (:table-name tabledef))]
- (sql-jdbc.execute/do-with-connection-with-options
- driver
- (sql-jdbc.conn/connection-details->spec driver (tx/dbdef->connection-details driver))
- {:write? false}
- (fn [^java.sql.Connection conn]
- (with-open [rset (.getTables (.getMetaData conn)
- #_catalog (if tx/*use-routing-details*
- (tx/db-test-env-var :redshift :db-routing)
- (tx/db-test-env-var :redshift :db))
- #_schema-pattern session-schema
- #_table-pattern table-name
- #_types (into-array String ["TABLE"]))]
- ;; if the ResultSet returns anything we know the table is already loaded.
- (.next rset)))))))
+ table-name (tx/db-qualified-table-name (:database-name dbdef) (:table-name tabledef))
+ ;; Use direct SQL query instead of JDBC metadata API (.getTables) because the metadata API
+ ;; can return stale/cached results on Redshift, causing flaky test failures.
+ jdbc-spec (sql-jdbc.conn/connection-details->spec driver (tx/dbdef->connection-details driver))
+ results (jdbc/query jdbc-spec
+ ["SELECT 1 FROM information_schema.tables WHERE table_schema = ? AND table_name = ? LIMIT 1"
+ session-schema
+ table-name])]
+ (seq results))))
(defmethod driver/database-supports? [:redshift :test/use-fake-sync]
[_driver _feature _database]