Skip to content

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

Athena and Databricks adjustments for data upload (#68821)

Riley Thompson78ae09542221
diff --git a/modules/drivers/athena/test/metabase/test/data/athena.clj b/modules/drivers/athena/test/metabase/test/data/athena.clj
index f48f74ec6bb..261b3cbc871 100644
--- a/modules/drivers/athena/test/metabase/test/data/athena.clj
+++ b/modules/drivers/athena/test/metabase/test/data/athena.clj
@@ -8,6 +8,7 @@
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
[metabase.driver.sql-jdbc.sync :as sql-jdbc.sync]
+ [metabase.lib.schema.common :as lib.schema.common]
[metabase.test.data.interface :as tx]
[metabase.test.data.sql :as sql.tx]
[metabase.test.data.sql-jdbc :as sql-jdbc.tx]
@@ -270,3 +271,10 @@
{:keys [database-name], :as _dbdef} :- [:map [:database-name :string]]]
(let [physical-name (ddl.i/format-name driver database-name)]
(contains? (existing-databases) physical-name)))
+
+(mu/defmethod load-data/do-insert! :athena
+ [driver :- :keyword
+ ^java.sql.Connection conn :- (lib.schema.common/instance-of-class java.sql.Connection)
+ table-identifier
+ rows]
+ (load-data/do-insert*! driver conn table-identifier rows {:transaction? false}))
diff --git a/test/metabase/test/data/sql_jdbc/load_data.clj b/test/metabase/test/data/sql_jdbc/load_data.clj
index 12fe5dbcd30..3a7ca5b0561 100644
--- a/test/metabase/test/data/sql_jdbc/load_data.clj
+++ b/test/metabase/test/data/sql_jdbc/load_data.clj
@@ -184,12 +184,12 @@
init
(reducible-chunks driver dbdef tabledef))))
-;;; default impl
-(mu/defmethod do-insert! :sql-jdbc/test-extensions
+(mu/defn do-insert*!
[driver :- :keyword
^java.sql.Connection conn :- (lib.schema.common/instance-of-class java.sql.Connection)
table-identifier
- rows]
+ rows
+ {:keys [transaction?] :or {transaction? true}}]
(let [statements (ddl/insert-rows-dml-statements driver table-identifier rows)]
;; `set-parameters` might try to look at DB timezone; we don't want to do that while loading the data because the
;; DB hasn't been synced yet
@@ -208,8 +208,10 @@
(try
;; TODO - why don't we use [[execute/execute-sql!]] here like we do below?
;; Tech Debt Issue: #39375
- (jdbc/execute! {:connection conn} sql-args {:set-parameters (fn [stmt params]
- (sql-jdbc.execute/set-parameters! driver stmt params))})
+ (jdbc/execute! {:connection conn
+ :transaction? transaction?}
+ sql-args {:set-parameters (fn [stmt params]
+ (sql-jdbc.execute/set-parameters! driver stmt params))})
(catch Throwable e
(throw (ex-info (format "INSERT FAILED: %s" (ex-message e))
{:driver driver
@@ -217,6 +219,14 @@
(rest sql-args))}
e))))))))
+;;; default impl
+(mu/defmethod do-insert! :sql-jdbc/test-extensions
+ [driver :- :keyword
+ ^java.sql.Connection conn :- (lib.schema.common/instance-of-class java.sql.Connection)
+ table-identifier
+ rows]
+ (do-insert*! driver conn table-identifier rows nil))
+
(defonce ^:private reference-load-durations
(delay (edn/read-string (slurp "test_resources/load-durations.edn"))))
@@ -231,7 +241,9 @@
{:write? true}
(fn [^java.sql.Connection conn]
;; make sure we're committing right away, and NOT trying to execute these in a transaction
- (.setAutoCommit conn true)
+ (try (.setAutoCommit conn true)
+ (catch Throwable __
+ (log/debugf "`.setAutoCommit` failed with engine `%s`" (name driver))))
(doseq [statement statements]
(execute/execute-sql! driver conn statement))))))