From b9464c30e9c39b0bf889a5ed421c07c98b1e0cf3 Mon Sep 17 00:00:00 2001
From: Cal Herries <39073188+calherries@users.noreply.github.com>
Date: Fri, 5 Apr 2024 15:16:23 +0300
Subject: [PATCH] Simple sync exceptions (#41066)
---
src/metabase/sync/util.clj | 4 ++--
test/metabase/test/data/impl/get_or_create.clj | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/metabase/sync/util.clj b/src/metabase/sync/util.clj
index a5c8153bf61..57a45fcc418 100644
--- a/src/metabase/sync/util.clj
+++ b/src/metabase/sync/util.clj
@@ -192,7 +192,7 @@
(do
(log/warn e message)
e)
- (throw (ex-info (format "%s: %s" message (ex-message e)) {:f f} e)))))))
+ (throw e))))))
(defmacro with-error-handling
"Execute `body` in a way that catches and logs any Exceptions thrown, and returns `nil` if they do so. Pass a
@@ -464,7 +464,7 @@
(do
(log/warn e (format "Error running step ''%s'' for %s" step-name (name-for-logging database)))
{:throwable e})
- (throw (ex-info (format "Error in sync step %s: %s" step-name (ex-message e)) {} e)))))))
+ (throw e))))))
end-time (t/zoned-date-time)]
[step-name (assoc results
:start-time start-time
diff --git a/test/metabase/test/data/impl/get_or_create.clj b/test/metabase/test/data/impl/get_or_create.clj
index 6e125a43eb5..91c18dde465 100644
--- a/test/metabase/test/data/impl/get_or_create.clj
+++ b/test/metabase/test/data/impl/get_or_create.clj
@@ -156,10 +156,7 @@
(catch Throwable e
(log/errorf e "create-database! failed; destroying %s database %s" driver (pr-str database-name))
(tx/destroy-db! driver database-definition)
- (throw (ex-info (format "Failed to create %s '%s' test database: %s" driver database-name (ex-message e))
- {:driver driver
- :database-name database-name}
- e)))))
+ (throw e))))
(defn- create-database-with-bound-settings! [driver dbdef]
(letfn [(thunk []
--
GitLab